diff options
author | Ian Romanick <[email protected]> | 2015-10-08 14:24:25 -0700 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2015-10-21 14:23:20 +0100 |
commit | 8e9b698c24a2551c68ea5d7cbd67e78fc1f8d6a2 (patch) | |
tree | f788b54cb6ba2f8af42d5d455f7122f8c6624002 /src/glsl | |
parent | 3b238aa08f527838f64d5880e6b017ba6b86cd2b (diff) |
glsl/linker: Use constant_initializer instead of constant_value to initialize uniforms
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Cc: "10.6 11.0" <[email protected]>
(cherry picked from commit 313372cae8e10e4b9a3de093d65c0a0d8954bb0d)
Diffstat (limited to 'src/glsl')
-rw-r--r-- | src/glsl/link_uniform_initializers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp index 05000fc39ef..0fcdb78724a 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); } } |