OSDN Git Service

Revert "glsl: Set location on structure-split sampler uniform variables"
authorKenneth Graunke <kenneth@whitecape.org>
Wed, 17 Apr 2019 21:48:10 +0000 (14:48 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Mon, 22 Apr 2019 22:39:55 +0000 (15:39 -0700)
commit47303b466c1b15c9827d935c6c75e89e52b84dde
tree65d6da66b64f28e769182d412650f1d72b0fdf50
parentb58e5fb6f317be771326f98d498483e45942beaf
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>
src/compiler/glsl/gl_nir_lower_samplers_as_deref.c