diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2019-04-17 14:48:10 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-04-23 09:18:20 -0700 |
commit | f223fb98e9aea2e60f4bfd25bf43c108c9a0d6bc (patch) | |
tree | a6548a53c7b742969e0db76bfb44085baa47bd1e | |
parent | 91671ec1f4891eae84c1bd13a77c613962a0cd52 (diff) |
Revert "glsl: Set location on structure-split sampler uniform variables"
This reverts commit 9e0c744f07a21fc7bb018a77cf83b057436d0d1b, which
regressed dEQP-GLES2.functional.uniform_api.random.3. It turns out
that the newly produced location is meaningless and impossible to
consume by drivers that want to look at gl_uniform_storage, so it's
probably better to leave it unset (0) than a number that looks usable.
Leave a tombstone^Wcomment to discourage the next person from making
the obvious looking fix.
See the next commit for a longer description of the problem.
This breaks tests/spec/glsl-1.10/execution/samplers/uniform-struct
on i965, which was originally fixed by the revert. The next commit
will fix it again.
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
(cherry picked from commit 47303b466c1b15c9827d935c6c75e89e52b84dde)
-rw-r--r-- | src/compiler/glsl/gl_nir_lower_samplers_as_deref.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c index 9bd0f9a4eb3..a33486b702f 100644 --- a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c +++ b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c @@ -167,7 +167,14 @@ lower_deref(nir_builder *b, struct lower_samplers_as_deref_state *state, } else { var = nir_variable_create(state->shader, nir_var_uniform, type, name); var->data.binding = binding; - var->data.location = location; + + /* Don't set var->data.location. The old structure location could be + * used to index into gl_uniform_storage, assuming the full structure + * was walked in order. With the new split variables, this invariant + * no longer holds and there's no meaningful way to start from a base + * location and access a particular array element. Just leave it 0. + */ + _mesa_hash_table_insert_pre_hashed(state->remap_table, hash, name, var); } |