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/mesa/main | |
| parent | 9d96d3803ab5dc896d4844ac785db57bb1717f91 (diff) | |
glsl/i965: move per stage AtomicBuffers list to gl_program
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 8 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index d2c1e583004..440bbb4b762 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1944,6 +1944,11 @@ struct gl_program GLubyte SamplerUnits[MAX_SAMPLERS]; union { + /** Fields used by GLSL programs */ + struct { + struct gl_active_atomic_buffer **AtomicBuffers; + } sh; + /** ARB assembly-style program fields */ struct { struct prog_instruction *Instructions; @@ -2354,9 +2359,6 @@ struct gl_linked_shader */ GLuint NumImages; - struct gl_active_atomic_buffer **AtomicBuffers; - unsigned NumAtomicBuffers; - /** * Number of types for subroutine uniforms. */ diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index cedcfa3a04c..aebd81214e7 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2152,7 +2152,6 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src, struct gl_program *dst = dst_sh->Program; - dst->info.num_abos = dst_sh->NumAtomicBuffers; dst->info.num_images = dst_sh->NumImages; switch (dst_sh->Stage) { |