mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-01-19 15:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved glClientActiveTexture and glActiveTexture calls before glEnable(GL_TEXTURE_2D) to make sure texture unit 0 gets affected. (#523)

Browse Source
This commit is contained in:
binary1248 2014-05-27 10:42:04 +02:00 committed by Lukas Dürrenberger
parent ff869777a9
commit 1dae89a8e0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SFML/Graphics/RenderTarget.cpp
View File

@ -351,6 +351,13 @@ void RenderTarget::resetGLStates()
// Make sure that extensions are initialized // Make sure that extensions are initialized
priv::ensureExtensionsInit(); priv::ensureExtensionsInit();
// Make sure that the texture unit which is active is the number 0
if (GLEXT_multitexture)
{
glCheck(GLEXT_glClientActiveTexture(GLEXT_GL_TEXTURE0));
glCheck(GLEXT_glActiveTexture(GLEXT_GL_TEXTURE0));
}
// Define the default OpenGL states // Define the default OpenGL states
glCheck(glDisable(GL_CULL_FACE)); glCheck(glDisable(GL_CULL_FACE));
glCheck(glDisable(GL_LIGHTING)); glCheck(glDisable(GL_LIGHTING));
@ -371,13 +378,6 @@ void RenderTarget::resetGLStates()
if (shaderAvailable) if (shaderAvailable)
applyShader(NULL); applyShader(NULL);
// Make sure that the texture unit which is active is the number 0
if (GLEXT_multitexture)
{
glCheck(GLEXT_glClientActiveTexture(GLEXT_GL_TEXTURE0));
glCheck(GLEXT_glActiveTexture(GLEXT_GL_TEXTURE0));
}
m_cache.useVertexCache = false; m_cache.useVertexCache = false;
// Set the default view // Set the default view