diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-03-27 14:51:02 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-03-29 09:59:03 +1100 |
| commit | 86d87d10474d1c5c5683acb28d4491e877432a90 (patch) | |
| tree | 5d4913ce3093820f6a3689a1315bfb720c3f966c /src/mesa/main | |
| parent | b8b3af2932039c6105d61f6922157a250ed8b79a (diff) | |
| download | external_mesa3d-86d87d10474d1c5c5683acb28d4491e877432a90.zip external_mesa3d-86d87d10474d1c5c5683acb28d4491e877432a90.tar.gz external_mesa3d-86d87d10474d1c5c5683acb28d4491e877432a90.tar.bz2 | |
mesa: remove initialized field from uniform storage
The only place this was used was in a gallium debug function that
had to be manually enabled.
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 32fad56..ba26072 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2568,7 +2568,6 @@ _mesa_UniformSubroutinesuiv(GLenum shadertype, GLsizei count, memcpy(&uni->storage[0], &indices[i], sizeof(GLuint) * uni_count); - uni->initialized = true; _mesa_propagate_uniforms_to_driver_storage(uni, 0, uni_count); i += uni_count; } while(i < count); @@ -2742,7 +2741,7 @@ _mesa_shader_init_subroutine_defaults(struct gl_shader *sh) for (j = 0; j < uni_count; j++) memcpy(&uni->storage[j], &val, sizeof(int)); - uni->initialized = true; + _mesa_propagate_uniforms_to_driver_storage(uni, 0, uni_count); } } diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 2ced201..ab5c3cd 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -815,8 +815,6 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, } } - uni->initialized = true; - _mesa_propagate_uniforms_to_driver_storage(uni, offset, count); /* If the uniform is a sampler, do the extra magic necessary to propagate @@ -1030,8 +1028,6 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, } } - uni->initialized = true; - _mesa_propagate_uniforms_to_driver_storage(uni, offset, count); } |