Mesa (master): v3d: Drop shadow comparison state from shader variant key.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: d80761b8f36245ed3529709b40a8f5d3721f0806
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d80761b8f36245ed3529709b40a8f5d3721f0806

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Dec 19 16:53:25 2018 -0800

v3d: Drop shadow comparison state from shader variant key.

The shadow state is now in the sampler.

---

 src/broadcom/compiler/v3d_compiler.h  | 2 --
 src/gallium/drivers/v3d/v3d_program.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h
index 797c687186..ec5fd87083 100644
--- a/src/broadcom/compiler/v3d_compiler.h
+++ b/src/broadcom/compiler/v3d_compiler.h
@@ -313,8 +313,6 @@ struct v3d_key {
                 uint8_t swizzle[4];
                 uint8_t return_size;
                 uint8_t return_channels;
-                unsigned compare_mode:1;
-                unsigned compare_func:3;
                 bool clamp_s:1;
                 bool clamp_t:1;
                 bool clamp_r:1;
diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c
index 6c9d5c461a..5047ff75c5 100644
--- a/src/gallium/drivers/v3d/v3d_program.c
+++ b/src/gallium/drivers/v3d/v3d_program.c
@@ -386,8 +386,6 @@ v3d_setup_shared_key(struct v3d_context *v3d, struct v3d_key *key,
                 }
 
                 if (sampler) {
-                        key->tex[i].compare_mode = sampler_state->compare_mode;
-                        key->tex[i].compare_func = sampler_state->compare_func;
                         key->tex[i].clamp_s =
                                 sampler_state->wrap_s == PIPE_TEX_WRAP_CLAMP;
                         key->tex[i].clamp_t =