Henri Verbeet : wined3d: Constants in constants_set should always have a valid location in shader_glsl_load_constantsB ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 302ad29742b11d911d8a337122d220f92b3f4bd7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=302ad29742b11d911d8a337122...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Apr 16 08:13:43 2013 +0200

wined3d: Constants in constants_set should always have a valid location in shader_glsl_load_constantsB().

---

 dlls/wined3d/glsl_shader.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index c84d73b..057763f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -650,12 +650,8 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con
          * locations of the constants to avoid looking up each time */
         snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i);
         tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name));
-        if (tmp_loc != -1)
-        {
-            /* We found this uniform name in the program - go ahead and send the data */
-            GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i]));
-            checkGLcall("glUniform1ivARB");
-        }
+        GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i]));
+        checkGLcall("glUniform1ivARB");
     }
 
     /* Load immediate constants */