From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 8 Oct 2015 21:24:25 +0000 (-0700)
Subject: glsl/linker: Use constant_initializer instead of constant_value to initialize uniforms
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=313372cae8e10e4b9a3de093d65c0a0d8954bb0d;p=mesa.git

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>
---

diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp
index 0918d2af9b8..065257b5a0e 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);
          }
       }