Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
acgl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ACGL
acgl
Commits
a66f5cfb
Commit
a66f5cfb
authored
Feb 05, 2012
by
Robert Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
typos and samplers added to objects.hh
parent
a79ddb60
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
include/ACGL/OpenGL/Objects.hh
include/ACGL/OpenGL/Objects.hh
+1
-0
include/ACGL/OpenGL/Objects/Query.hh
include/ACGL/OpenGL/Objects/Query.hh
+1
-1
include/ACGL/OpenGL/Objects/Texture.hh
include/ACGL/OpenGL/Objects/Texture.hh
+1
-1
No files found.
include/ACGL/OpenGL/Objects.hh
View file @
a66f5cfb
...
...
@@ -21,6 +21,7 @@
#include <ACGL/OpenGL/Objects/ShaderProgram.hh>
#include <ACGL/OpenGL/Objects/ShaderProgramObject.hh>
#include <ACGL/OpenGL/Objects/Texture.hh>
#include <ACGL/OpenGL/Objects/Sampler.hh>
#include <ACGL/OpenGL/Objects/Uniform.hh>
#include <ACGL/OpenGL/Objects/VertexBufferObject.hh>
#include <ACGL/OpenGL/Objects/Viewport.hh>
...
...
include/ACGL/OpenGL/Objects/Query.hh
View file @
a66f5cfb
...
...
@@ -182,4 +182,4 @@ ACGL_SHARED_TYPEDEF(PrimitiveQuery)
}
// OpenGL
}
// ACGL
#endif // ACGL_OPENGL_OBJECTS_
RENDERBUFFER
_HH
#endif // ACGL_OPENGL_OBJECTS_
QUERY
_HH
include/ACGL/OpenGL/Objects/Texture.hh
View file @
a66f5cfb
...
...
@@ -86,7 +86,7 @@ public:
// ===================================================================================================== \/
public:
//! Activate texture unit and bind this texture.
inline
void
bind
(
GL
enum
_textureUnit
)
const
inline
void
bind
(
GL
uint
_textureUnit
)
const
{
glActiveTexture
(
GL_TEXTURE0
+
_textureUnit
);
glBindTexture
(
mTarget
,
mObjectName
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment