From 2222bb37d21cb27116c06d07bec445fad541b295 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 21 Oct 2016 23:42:09 -0300 Subject: [PATCH] Removed gl.bindTexture, so it won't get accidentally used. --HG-- branch : minor --- src/modules/graphics/opengl/OpenGL.cpp | 9 --------- src/modules/graphics/opengl/OpenGL.h | 6 ------ 2 files changed, 15 deletions(-) diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index a7f293e18..da08aeaea 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -566,15 +566,6 @@ void OpenGL::setTextureUnit(int textureunit) state.curTextureUnit = textureunit; } -void OpenGL::bindTexture(GLuint texture) -{ - if (texture != state.boundTextures[state.curTextureUnit]) - { - state.boundTextures[state.curTextureUnit] = texture; - glBindTexture(GL_TEXTURE_2D, texture); - } -} - void OpenGL::bindTextureToUnit(GLuint texture, int textureunit, bool restoreprev) { if (texture != state.boundTextures[textureunit]) diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h index 10bbf8c95..64b4ff6c8 100644 --- a/src/modules/graphics/opengl/OpenGL.h +++ b/src/modules/graphics/opengl/OpenGL.h @@ -348,12 +348,6 @@ public: **/ void setTextureUnit(int textureunit); - /** - * Helper for binding an OpenGL texture. - * Makes sure we aren't redundantly binding textures. - **/ - void bindTexture(GLuint texture); - /** * Helper for binding a texture to a specific texture unit. *