Module: Mesa Branch: master Commit: 313372cae8e10e4b9a3de093d65c0a0d8954bb0d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=313372cae8e10e4b9a3de093d65c0a0d8954bb0d
Author: Ian Romanick <[email protected]> Date: Thu Oct 8 14:24:25 2015 -0700 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]> --- src/glsl/link_uniform_initializers.cpp | 4 ++-- 1 file 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); } } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
