Commit 181fc1ce authored by Robert Menzel's avatar Robert Menzel

updated to compile with OpenGL 3.0 and 3.1

parent 50f22e82
......@@ -326,7 +326,7 @@ public:
glMultiDrawElements( mMode, count, type, indices, primcount );
}
#if (ACGL_OPENGL_VERSION >= 31)
#if (ACGL_OPENGL_VERSION >= 32)
inline void multiDrawElements( GLsizei *count, GLenum type, GLvoid **indices, GLsizei primcount, GLint *basevertex ) const
{
glMultiDrawElementsBaseVertex( mMode, count, type, indices, primcount, basevertex );
......
......@@ -172,14 +172,18 @@ GLuint TextureBase::bindAndGetOldTexture() const
else if(mTarget == GL_TEXTURE_3D) glGetIntegerv(GL_TEXTURE_BINDING_3D, &prevTexture);
else if(mTarget == GL_TEXTURE_1D_ARRAY) glGetIntegerv(GL_TEXTURE_BINDING_1D_ARRAY, &prevTexture);
else if(mTarget == GL_TEXTURE_2D_ARRAY) glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY, &prevTexture);
else if(mTarget == GL_TEXTURE_CUBE_MAP) glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &prevTexture);
#if (ACGL_OPENGL_VERSION >= 31)
else if(mTarget == GL_TEXTURE_RECTANGLE) glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &prevTexture);
#if (ACGL_OPENGL_VERSION >= 32)
else if(mTarget == GL_TEXTURE_2D_MULTISAMPLE) glGetIntegerv(GL_TEXTURE_BINDING_2D_MULTISAMPLE, &prevTexture);
else if(mTarget == GL_TEXTURE_2D_MULTISAMPLE_ARRAY) glGetIntegerv(GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY, &prevTexture);
else if(mTarget == GL_TEXTURE_CUBE_MAP) glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &prevTexture);
#if (ACGL_OPENGL_VERSION >= 40)
else if(mTarget == GL_TEXTURE_CUBE_MAP_ARRAY) glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY, &prevTexture);
#endif
#endif // 4.0
else if(mTarget == GL_TEXTURE_BUFFER) glGetIntegerv(GL_TEXTURE_BINDING_BUFFER, &prevTexture);
#endif // 3.2
#endif // 3.1
else {
ACGL::Utils::error() << "Unknown texture target, will create sideeffecs as old bound texture can not get restored!" << std::endl;
}
......
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