diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/link_uniform_initializers.cpp | 5 | ||||
| -rw-r--r-- | src/compiler/glsl/link_uniforms.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp index 93340baf61f..6f05a3a8098 100644 --- a/src/compiler/glsl/link_uniform_initializers.cpp +++ b/src/compiler/glsl/link_uniform_initializers.cpp @@ -141,9 +141,10 @@ set_opaque_binding(void *mem_ctx, gl_shader_program *prog, storage->opaque[sh].active) { for (unsigned i = 0; i < elements; i++) { const unsigned index = storage->opaque[sh].index + i; - if (index >= ARRAY_SIZE(shader->ImageUnits)) + if (index >= ARRAY_SIZE(shader->Program->sh.ImageUnits)) break; - shader->ImageUnits[index] = storage->storage[i].i; + shader->Program->sh.ImageUnits[index] = + storage->storage[i].i; } } } diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index 256afa32fb6..cd00837cca9 100644 --- a/src/compiler/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp @@ -613,7 +613,7 @@ private: this->next_image += MAX2(1, uniform->array_elements); for (unsigned i = first; i < MIN2(next_image, MAX_IMAGE_UNIFORMS); i++) - prog->_LinkedShaders[shader_type]->ImageAccess[i] = access; + prog->_LinkedShaders[shader_type]->Program->sh.ImageAccess[i] = access; } } @@ -1308,7 +1308,6 @@ link_assign_uniform_locations(struct gl_shader_program *prog, * types cannot have initializers." */ memset(sh->SamplerUnits, 0, sizeof(sh->SamplerUnits)); - memset(sh->ImageUnits, 0, sizeof(sh->ImageUnits)); link_update_uniform_buffer_variables(sh, i); |