Henri Verbeet : wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsB ().
Alexandre Julliard
julliard at winehq.org
Tue Apr 16 13:37:17 CDT 2013
Module: wine
Branch: master
Commit: 1a551fe5f91c3ed0c56418a25228244e43eee510
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a551fe5f91c3ed0c56418a25228244e43eee510
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Apr 16 08:13:44 2013 +0200
wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsB().
---
dlls/wined3d/glsl_shader.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 057763f..3493ff2 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -651,7 +651,6 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con
snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i);
tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name));
GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i]));
- checkGLcall("glUniform1ivARB");
}
/* Load immediate constants */
@@ -666,13 +665,11 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con
snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, idx);
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, values));
- checkGLcall("glUniform1ivARB");
- }
+ GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, values));
ptr = list_next(&shader->constantsB, ptr);
}
+
+ checkGLcall("shader_glsl_load_constantsB()");
}
static void reset_program_constant_version(struct wine_rb_entry *entry, void *context)
More information about the wine-cvs
mailing list