summaryrefslogtreecommitdiffstats
path: root/src/glsl/link_uniform_initializers.cpp
diff options
context:
space:
mode:
authorKristian Høgsberg Kristensen <[email protected]>2015-10-08 12:25:34 -0700
committerKristian Høgsberg Kristensen <[email protected]>2015-10-08 17:20:24 -0700
commitfc2a66cfcddea34af0e93dd2221ae1fd3fdd9e87 (patch)
tree3aa60e04c953b6f25e019cfef00aecb9c11bc4fa /src/glsl/link_uniform_initializers.cpp
parent48a87f4ba062e572a66f546997366d8896a4ecd1 (diff)
parentc71f0d45e6d0081ea814fb0b16baec4e75a07bcb (diff)
Merge ../mesa into vulkan
Diffstat (limited to 'src/glsl/link_uniform_initializers.cpp')
-rw-r--r--src/glsl/link_uniform_initializers.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp
index b0a4ec3f2fb..e9e108a2765 100644
--- a/src/glsl/link_uniform_initializers.cpp
+++ b/src/glsl/link_uniform_initializers.cpp
@@ -135,16 +135,16 @@ set_opaque_binding(gl_shader_program *prog, const char *name, int binding)
if (shader) {
if (storage->type->base_type == GLSL_TYPE_SAMPLER &&
- storage->sampler[sh].active) {
+ storage->opaque[sh].active) {
for (unsigned i = 0; i < elements; i++) {
- const unsigned index = storage->sampler[sh].index + i;
+ const unsigned index = storage->opaque[sh].index + i;
shader->SamplerUnits[index] = storage->storage[i].i;
}
} else if (storage->type->base_type == GLSL_TYPE_IMAGE &&
- storage->image[sh].active) {
+ storage->opaque[sh].active) {
for (unsigned i = 0; i < elements; i++) {
- const unsigned index = storage->image[sh].index + i;
+ const unsigned index = storage->opaque[sh].index + i;
shader->ImageUnits[index] = storage->storage[i].i;
}
}
@@ -244,8 +244,8 @@ set_uniform_initializer(void *mem_ctx, gl_shader_program *prog,
for (int sh = 0; sh < MESA_SHADER_STAGES; sh++) {
gl_shader *shader = prog->_LinkedShaders[sh];
- if (shader && storage->sampler[sh].active) {
- unsigned index = storage->sampler[sh].index;
+ if (shader && storage->opaque[sh].active) {
+ unsigned index = storage->opaque[sh].index;
shader->SamplerUnits[index] = storage->storage[0].i;
}