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

This commit is contained in:
Henri Verbeet 2013-04-16 08:13:43 +02:00 committed by Alexandre Julliard
parent 00cc81dc69
commit 302ad29742
1 changed files with 2 additions and 6 deletions

View File

@ -650,13 +650,9 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con
* locations of the constants to avoid looking up each time */ * locations of the constants to avoid looking up each time */
snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i); snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i);
tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); 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])); GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i]));
checkGLcall("glUniform1ivARB"); checkGLcall("glUniform1ivARB");
} }
}
/* Load immediate constants */ /* Load immediate constants */
ptr = list_head(&shader->constantsB); ptr = list_head(&shader->constantsB);