diff options
| author | Timothy Arceri <[email protected]> | 2016-11-09 09:49:59 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-06 11:21:42 +1100 |
| commit | 076ab157ff2ed7a98b09363bce355247f4ed71e6 (patch) | |
| tree | 1df981f143864f8a22871471fa6cd78f5e577f10 /src/compiler/glsl/link_uniforms.cpp | |
| parent | 937523971f42f37b40badb962e575ecd8258b2d5 (diff) | |
st/mesa/glsl: move SamplerTargets to gl_program
This will help allow us to simplify the handling of samplers by
storing them in a single location rather than duplicating them in
both gl_linked_shader and gl_program.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/compiler/glsl/link_uniforms.cpp')
| -rw-r--r-- | src/compiler/glsl/link_uniforms.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index 8604dba4b07..57a7db41ff4 100644 --- a/src/compiler/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp @@ -1248,10 +1248,11 @@ link_assign_uniform_storage(struct gl_context *ctx, parcel.shader_samplers_used; prog->_LinkedShaders[i]->shadow_samplers = parcel.shader_shadow_samplers; - STATIC_ASSERT(sizeof(prog->_LinkedShaders[i]->SamplerTargets) == + STATIC_ASSERT(sizeof(prog->_LinkedShaders[i]->Program->sh.SamplerTargets) == sizeof(parcel.targets)); - memcpy(prog->_LinkedShaders[i]->SamplerTargets, parcel.targets, - sizeof(prog->_LinkedShaders[i]->SamplerTargets)); + memcpy(prog->_LinkedShaders[i]->Program->sh.SamplerTargets, + parcel.targets, + sizeof(prog->_LinkedShaders[i]->Program->sh.SamplerTargets)); } #ifndef NDEBUG |