From 503716fa8623f2f59a909adac0bd629c71661119 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 24 Apr 2018 15:23:27 -0700 Subject: broadcom/vc5: Remove leftover vc4 MSAA lowering setup in the FS key. --- src/broadcom/compiler/v3d_compiler.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/broadcom/compiler') 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; }; -- cgit v1.2.3