diff options
| author | Timothy Arceri <[email protected]> | 2016-11-09 13:35:11 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-09 15:27:35 +1100 |
| commit | ae632afe4fd860f016d2e5b360d66dc4e72ce72a (patch) | |
| tree | 1d64fb52cbc54e1de3e78d66854964ccafc13ab9 /src/mesa/main | |
| parent | 4b30011d34bff039b84f6cd14bf58ea691f549eb (diff) | |
st/mesa/glsl: set num_images directly in shader_info
This change also removes the now duplicate NumImages field.
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 7 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 691323d8f3c..793a527cb45 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2382,13 +2382,6 @@ struct gl_linked_shader struct exec_list *fragdata_arrays; struct glsl_symbol_table *symbols; - /** - * Number of image uniforms defined in the shader. It specifies - * the number of valid elements in the \c ImageUnits and \c - * ImageAccess arrays. - */ - GLuint NumImages; - struct gl_shader_info info; }; diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 7771b7ce7da..e67dc52c156 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2175,7 +2175,6 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src, struct gl_program *dst = dst_sh->Program; - dst->info.num_images = dst_sh->NumImages; dst->info.separate_shader = src->SeparateShader; switch (dst_sh->Stage) { |