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>
(cherry picked from commit 313372cae8)
This commit is contained in:
Ian Romanick 2015-10-08 14:24:25 -07:00 committed by Emil Velikov
parent 3b238aa08f
commit 8e9b698c24

View file

@ -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);
}
}