From 76a76a784f4d5c2a1202a66a0f431c67581fa525 Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Thu, 25 Feb 2010 12:37:51 +0000 Subject: [PATCH] Minor modifications to shader and image activation git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1426 4e206d99-4929-0410-ac5d-dfc041789085 --- src/SFML/Graphics/Image.cpp | 6 +- src/SFML/Graphics/Renderer.cpp | 22 ++++--- src/SFML/Graphics/Shader.cpp | 107 +++++++++++++++------------------ 3 files changed, 61 insertions(+), 74 deletions(-) diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp index 9a42017bf..cb7c57de2 100644 --- a/src/SFML/Graphics/Image.cpp +++ b/src/SFML/Graphics/Image.cpp @@ -493,11 +493,7 @@ void Image::Bind() const EnsureTextureUpdate(); // Bind it - if (myTexture) - { - GLCheck(glEnable(GL_TEXTURE_2D)); - GLCheck(glBindTexture(GL_TEXTURE_2D, myTexture)); - } + GLCheck(glBindTexture(GL_TEXTURE_2D, myTexture)); } diff --git a/src/SFML/Graphics/Renderer.cpp b/src/SFML/Graphics/Renderer.cpp index 45292331c..886abf829 100644 --- a/src/SFML/Graphics/Renderer.cpp +++ b/src/SFML/Graphics/Renderer.cpp @@ -58,6 +58,7 @@ void Renderer::Initialize() // Default render states GLCheck(glDisable(GL_LIGHTING)); GLCheck(glDisable(GL_DEPTH_TEST)); + GLCheck(glEnable(GL_TEXTURE_2D)); GLCheck(glEnable(GL_ALPHA_TEST)); GLCheck(glAlphaFunc(GL_GREATER, 0)); @@ -241,7 +242,7 @@ void Renderer::SetTexture(const Image* texture) if (texture) texture->Bind(); else - GLCheck(glDisable(GL_TEXTURE_2D)); + GLCheck(glBindTexture(GL_TEXTURE_2D, 0)); // Store it myTexture = texture; @@ -255,15 +256,18 @@ void Renderer::SetShader(const Shader* shader) { if ((shader != myShader) || !myShaderIsValid) { - // Apply the new shader - if (shader) - shader->Bind(); - else if (myShaderIsValid && myShader) - myShader->Unbind(); + if (Shader::IsAvailable()) // to avoid calling possibly unsupported functions + { + // Apply the new shader + if (shader) + shader->Bind(); + else + GLCheck(glUseProgramObjectARB(0)); - // Store it - myShader = shader; - myShaderIsValid = true; + // Store it + myShader = shader; + myShaderIsValid = true; + } } } diff --git a/src/SFML/Graphics/Shader.cpp b/src/SFML/Graphics/Shader.cpp index d2dd6c160..337a30fe3 100644 --- a/src/SFML/Graphics/Shader.cpp +++ b/src/SFML/Graphics/Shader.cpp @@ -45,8 +45,7 @@ Shader::Shader() : myShaderProgram (0), myCurrentTexture(-1) { - // Make sure that GLEW is initialized - priv::EnsureGlewInit(); + } @@ -209,82 +208,67 @@ void Shader::SetParameter(const std::string& name, const Vector3f& v) //////////////////////////////////////////////////////////// void Shader::SetTexture(const std::string& name, const Image& texture) { - // Check if there is a texture unit available - GLint maxUnits; - GLCheck(glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &maxUnits)); - if (myTextures.size() + 1 >= static_cast(maxUnits)) + if (myShaderProgram) { - Err() << "Impossible to use texture \"" << name << "\" for shader: all available texture units are used" << std::endl; - return; - } + // Check if there is a texture unit available + GLint maxUnits; + GLCheck(glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &maxUnits)); + if (myTextures.size() + 1 >= static_cast(maxUnits)) + { + Err() << "Impossible to use texture \"" << name << "\" for shader: all available texture units are used" << std::endl; + return; + } - // Make sure the given name is a valid variable in the effect - int location = glGetUniformLocationARB(myShaderProgram, name.c_str()); - if (location == -1) - { - Err() << "Texture \"" << name << "\" not found in shader" << std::endl; - return; - } + // Make sure the given name is a valid variable in the effect + int location = glGetUniformLocationARB(myShaderProgram, name.c_str()); + if (location == -1) + { + Err() << "Texture \"" << name << "\" not found in shader" << std::endl; + return; + } - // Store the texture for later use - if (&texture != &CurrentTexture) - myTextures[location] = &texture; - else - myCurrentTexture = location; + // Store the texture for later use + if (&texture != &CurrentTexture) + myTextures[location] = &texture; + else + myCurrentTexture = location; + } } //////////////////////////////////////////////////////////// void Shader::Bind() const { - // Make sure that we have a valid program - if (!myShaderProgram) - return; - - // Enable the program - GLCheck(glUseProgramObjectARB(myShaderProgram)); - - // Bind the textures - TextureTable::const_iterator it = myTextures.begin(); - for (std::size_t i = 0; i < myTextures.size(); ++i) + if (myShaderProgram) { - GLint index = static_cast(i + 1); - GLCheck(glUniform1iARB(it->first, index)); - GLCheck(glActiveTextureARB(GL_TEXTURE0_ARB + index)); - it->second->Bind(); - it++; + // Enable the program + GLCheck(glUseProgramObjectARB(myShaderProgram)); + + // Bind the textures + TextureTable::const_iterator it = myTextures.begin(); + for (std::size_t i = 0; i < myTextures.size(); ++i) + { + GLint index = static_cast(i + 1); + GLCheck(glUniform1iARB(it->first, index)); + GLCheck(glActiveTextureARB(GL_TEXTURE0_ARB + index)); + it->second->Bind(); + it++; + } + + // Make sure that the texture unit which is left active is the number 0 + GLCheck(glActiveTextureARB(GL_TEXTURE0_ARB)); + + // Bind the current texture + if (myCurrentTexture != -1) + GLCheck(glUniform1iARB(myCurrentTexture, 0)); } - - // Make sure that the texture unit which is left active is the number 0 - GLCheck(glActiveTextureARB(GL_TEXTURE0_ARB)); - - // Bind the current texture - if (myCurrentTexture != -1) - GLCheck(glUniform1iARB(myCurrentTexture, 0)); } //////////////////////////////////////////////////////////// void Shader::Unbind() const { - // First make sure that the program is currently bound - GLhandleARB program = glGetHandleARB(GL_PROGRAM_OBJECT_ARB); - if (!myShaderProgram || (myShaderProgram != program)) - return; - - // Unbind the program GLCheck(glUseProgramObjectARB(0)); - - // Disable texture units - for (std::size_t i = 0; i < myTextures.size(); ++i) - { - GLint index = static_cast(i + 1); - GLCheck(glActiveTextureARB(GL_TEXTURE0_ARB + index)); - GLCheck(glBindTexture(GL_TEXTURE_2D, 0)); - } - - // Make sure that the texture unit which is left active is the number 0 - GLCheck(glActiveTextureARB(GL_TEXTURE0_ARB)); } @@ -326,6 +310,9 @@ bool Shader::CompileProgram() return false; } + // Make sure that GLEW is initialized (extra safety -- it is already done in IsAvailable()) + priv::EnsureGlewInit(); + // Destroy the shader if it was already created if (myShaderProgram) GLCheck(glDeleteObjectARB(myShaderProgram));