diff options
| author | Timothy Arceri <[email protected]> | 2016-11-09 23:50:07 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-06 11:21:42 +1100 |
| commit | 5ceedefd6c32fa31e6a35831a8a7a315e009ccc3 (patch) | |
| tree | 55ebe3c9667c7a2d210c28035f49c00b947aa1dd /src/compiler/glsl | |
| parent | 238486884e74888d32d64ea9d934ba6b07e79eb2 (diff) | |
mesa/glsl: remove hack to reset sampler units to zero
Now that we have the is_arb_asm flag we can just skip the
initialisation.
V2: remove hack from standalone compiler where it was never
needed since it only compiles glsl shaders.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/link_uniforms.cpp | 11 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone.cpp | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index 90eac5cc512..caee147aa1d 100644 --- a/src/compiler/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp @@ -1299,17 +1299,6 @@ link_assign_uniform_locations(struct gl_shader_program *prog, if (sh == NULL) continue; - /* Uniforms that lack an initializer in the shader code have an initial - * value of zero. This includes sampler uniforms. - * - * Page 24 (page 30 of the PDF) of the GLSL 1.20 spec says: - * - * "The link time initial value is either the value of the variable's - * initializer, if present, or 0 if no initializer is present. Sampler - * types cannot have initializers." - */ - memset(sh->SamplerUnits, 0, sizeof(sh->SamplerUnits)); - link_update_uniform_buffer_variables(sh, i); /* Reset various per-shader target counts. diff --git a/src/compiler/glsl/standalone.cpp b/src/compiler/glsl/standalone.cpp index e93e9afcbfa..9a8d75d2863 100644 --- a/src/compiler/glsl/standalone.cpp +++ b/src/compiler/glsl/standalone.cpp @@ -107,10 +107,6 @@ init_gl_program(struct gl_program *prog, GLenum target, bool is_arb_asm) prog->RefCount = 1; prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB; prog->is_arb_asm = is_arb_asm; - - /* default mapping from samplers to texture units */ - for (int i = 0; i < MAX_SAMPLERS; i++) - prog->SamplerUnits[i] = i; } struct gl_program * |