summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2015-10-08 14:24:25 -0700
committerIan Romanick <ian.d.romanick@intel.com>2015-10-12 10:15:13 -0700
commit313372cae8e10e4b9a3de093d65c0a0d8954bb0d (patch)
tree2e7c1e3d1f4c190702bdcc104665e744aa2bacb7
parent8acce5d53af44a3d1d05a26e69559fd35f835de4 (diff)
downloadexternal_mesa3d-313372cae8e10e4b9a3de093d65c0a0d8954bb0d.zip
external_mesa3d-313372cae8e10e4b9a3de093d65c0a0d8954bb0d.tar.gz
external_mesa3d-313372cae8e10e4b9a3de093d65c0a0d8954bb0d.tar.bz2
glsl/linker: Use constant_initializer instead of constant_value to initialize uniforms
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Cc: "10.6 11.0" <mesa-stable@lists.freedesktop.org>
-rw-r--r--src/glsl/link_uniform_initializers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp
index 0918d2a..065257b 100644
--- a/src/glsl/link_uniform_initializers.cpp
+++ b/src/glsl/link_uniform_initializers.cpp
@@ -326,9 +326,9 @@ link_set_uniform_initializers(struct gl_shader_program *prog,
} else {
assert(!"Explicit binding not on a sampler, UBO or atomic.");
}
- } else if (var->constant_value) {
+ } else if (var->constant_initializer) {
linker::set_uniform_initializer(mem_ctx, prog, var->name,
- var->type, var->constant_value,
+ var->type, var->constant_initializer,
boolean_true);
}
}