diff options
| author | Timothy Arceri <[email protected]> | 2016-11-11 11:45:54 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-11-19 09:35:58 +1100 |
| commit | c20564ae3ec2b5ac6bee23751d53a92b2dc09067 (patch) | |
| tree | 9db3be4f51b83d177af29bc28214ec76f95993aa /src/compiler/glsl | |
| parent | 9d96d3803ab5dc896d4844ac785db57bb1717f91 (diff) | |
glsl/i965: move per stage AtomicBuffers list to gl_program
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/link_atomics.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp index 053e7a433e0..46a8843d2cb 100644 --- a/src/compiler/glsl/link_atomics.cpp +++ b/src/compiler/glsl/link_atomics.cpp @@ -267,8 +267,9 @@ link_assign_atomic_counter_resources(struct gl_context *ctx, */ for (unsigned j = 0; j < MESA_SHADER_STAGES; ++j) { if (prog->_LinkedShaders[j] && num_atomic_buffers[j] > 0) { - prog->_LinkedShaders[j]->NumAtomicBuffers = num_atomic_buffers[j]; - prog->_LinkedShaders[j]->AtomicBuffers = + struct gl_program *gl_prog = prog->_LinkedShaders[j]->Program; + gl_prog->info.num_abos = num_atomic_buffers[j]; + gl_prog->sh.AtomicBuffers = rzalloc_array(prog, gl_active_atomic_buffer *, num_atomic_buffers[j]); @@ -277,8 +278,7 @@ link_assign_atomic_counter_resources(struct gl_context *ctx, struct gl_active_atomic_buffer *atomic_buffer = &prog->AtomicBuffers[i]; if (atomic_buffer->StageReferences[j]) { - prog->_LinkedShaders[j]->AtomicBuffers[intra_stage_idx] = - atomic_buffer; + gl_prog->sh.AtomicBuffers[intra_stage_idx] = atomic_buffer; for (unsigned u = 0; u < atomic_buffer->NumUniforms; u++) { prog->UniformStorage[atomic_buffer->Uniforms[u]].opaque[j].index = |