From: Eric Anholt <eric@anholt.net>
Date: Tue, 24 Apr 2018 22:23:27 +0000 (-0700)
Subject: broadcom/vc5: Remove leftover vc4 MSAA lowering setup in the FS key.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=503716fa8623f2f59a909adac0bd629c71661119;p=mesa.git

broadcom/vc5: Remove leftover vc4 MSAA lowering setup in the FS key.
---

diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h
index 207e29733aa..e89ea7be217 100644
--- a/src/broadcom/compiler/v3d_compiler.h
+++ b/src/broadcom/compiler/v3d_compiler.h
@@ -302,18 +302,11 @@ struct v3d_key {
                 uint8_t swizzle[4];
                 uint8_t return_size;
                 uint8_t return_channels;
-                union {
-                        struct {
-                                unsigned compare_mode:1;
-                                unsigned compare_func:3;
-                                bool clamp_s:1;
-                                bool clamp_t:1;
-                                bool clamp_r:1;
-                        };
-                        struct {
-                                uint16_t msaa_width, msaa_height;
-                        };
-                };
+                unsigned compare_mode:1;
+                unsigned compare_func:3;
+                bool clamp_s:1;
+                bool clamp_t:1;
+                bool clamp_r:1;
         } tex[V3D_MAX_TEXTURE_SAMPLERS];
         uint8_t ucp_enables;
 };
diff --git a/src/gallium/drivers/vc5/vc5_program.c b/src/gallium/drivers/vc5/vc5_program.c
index 7bad80a1684..6beb3359f29 100644
--- a/src/gallium/drivers/vc5/vc5_program.c
+++ b/src/gallium/drivers/vc5/vc5_program.c
@@ -363,10 +363,7 @@ vc5_setup_shared_key(struct vc5_context *vc5, struct v3d_key *key,
                         key->tex[i].swizzle[3] = PIPE_SWIZZLE_W;
                 }
 
-                if (sampler->texture->nr_samples > 1) {
-                        key->tex[i].msaa_width = sampler->texture->width0;
-                        key->tex[i].msaa_height = sampler->texture->height0;
-                } else if (sampler){
+                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 =