Commit a66f5cfb authored by Robert Menzel's avatar Robert Menzel

typos and samplers added to objects.hh

parent a79ddb60
......@@ -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>
......
......@@ -182,4 +182,4 @@ ACGL_SHARED_TYPEDEF(PrimitiveQuery)
} // OpenGL
} // ACGL
#endif // ACGL_OPENGL_OBJECTS_RENDERBUFFER_HH
#endif // ACGL_OPENGL_OBJECTS_QUERY_HH
......@@ -86,7 +86,7 @@ public:
// ===================================================================================================== \/
public:
//! Activate texture unit and bind this texture.
inline void bind(GLenum _textureUnit) const
inline void bind(GLuint _textureUnit) const
{
glActiveTexture(GL_TEXTURE0 + _textureUnit);
glBindTexture(mTarget, mObjectName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment