diff options
author | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
commit | 112d89481850102f28b6e7ff4f40b65c41e11f6c (patch) | |
tree | 9e22963aeda3f588d4aa3aa270fdba74922028c7 /mesalib/src/glsl/link_uniforms.cpp | |
parent | bcb354180f20f0c410a77bd32cbf2c1e799632d5 (diff) | |
parent | 6c0c95d6045d2d2b4e6a3a2f11457850031c57bc (diff) | |
download | vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.gz vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.bz2 vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/link_uniforms.cpp')
-rw-r--r-- | mesalib/src/glsl/link_uniforms.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp index a127ee7f5..f1484617b 100644 --- a/mesalib/src/glsl/link_uniforms.cpp +++ b/mesalib/src/glsl/link_uniforms.cpp @@ -841,7 +841,8 @@ link_set_image_access_qualifiers(struct gl_shader_program *prog) } void -link_assign_uniform_locations(struct gl_shader_program *prog) +link_assign_uniform_locations(struct gl_shader_program *prog, + unsigned int boolean_true) { ralloc_free(prog->UniformStorage); prog->UniformStorage = NULL; @@ -1013,7 +1014,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog) prog->UniformStorage = uniforms; link_set_image_access_qualifiers(prog); - link_set_uniform_initializers(prog); + link_set_uniform_initializers(prog, boolean_true); return; } |