diff options
Diffstat (limited to 'src/glsl/link_uniforms.cpp')
| -rw-r--r-- | src/glsl/link_uniforms.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp index 04218be7ac9..ad636681f8e 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/glsl/link_uniforms.cpp @@ -653,7 +653,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog) * types cannot have initializers." */ memset(prog->_LinkedShaders[i]->SamplerUnits, 0, - sizeof(gl_shader::SamplerUnits)); + sizeof(prog->_LinkedShaders[i]->SamplerUnits)); link_update_uniform_buffer_variables(prog->_LinkedShaders[i]); @@ -724,9 +724,9 @@ link_assign_uniform_locations(struct gl_shader_program *prog) prog->_LinkedShaders[i]->active_samplers = parcel.shader_samplers_used; prog->_LinkedShaders[i]->shadow_samplers = parcel.shader_shadow_samplers; - assert(sizeof(gl_shader::SamplerTargets) == sizeof(parcel.targets)); + STATIC_ASSERT(sizeof(prog->_LinkedShaders[i]->SamplerTargets) == sizeof(parcel.targets)); memcpy(prog->_LinkedShaders[i]->SamplerTargets, parcel.targets, - sizeof(gl_shader::SamplerTargets)); + sizeof(prog->_LinkedShaders[i]->SamplerTargets)); } #ifndef NDEBUG |