From aa77a9cf5a4821100eb0dbc9a47bcff410a3a73f Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 12 Jan 2018 12:24:36 -0800
Subject: [PATCH] broadcom/vc5: Rename V3D 3.x Flat Shade Action to match v4.x
 naming.

Now that the actions are reused for centroid and nonperspective, give them
a more generic name.
---
 src/broadcom/cle/v3d_packet_v33.xml |  6 +++---
 src/gallium/drivers/vc5/vc5_emit.c  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/broadcom/cle/v3d_packet_v33.xml b/src/broadcom/cle/v3d_packet_v33.xml
index 6be632112a2..aac9fbfd28f 100644
--- a/src/broadcom/cle/v3d_packet_v33.xml
+++ b/src/broadcom/cle/v3d_packet_v33.xml
@@ -92,7 +92,7 @@
     <value name="ANISOTROPIC_16_1" value="15"/>
   </enum>
 
-  <enum name="Flat Shade Action" prefix="V3D_FLAT_SHADE_ACTION">
+  <enum name="Varying Flags Action" prefix="V3D_VARYING_FLAGS_ACTION">
     <value name="unchanged" value="0"/>
     <value name="zeroed" value="1"/>
     <value name="set" value="2"/>
@@ -456,8 +456,8 @@
 
   <packet code="98" name="Flat Shade Flags">
     <field name="Flat Shade Flags for varyings V0*24" size="24" start="8" type="uint"/>
-    <field name="Action for Flat Shade Flags of higher numbered varyings" size="2" start="6" type="Flat Shade Action"/>
-    <field name="Action for Flat Shade Flags of lower numbered varyings" size="2" start="4" type="Flat Shade Action"/>
+    <field name="Action for Flat Shade Flags of higher numbered varyings" size="2" start="6" type="Varying Flags Action"/>
+    <field name="Action for Flat Shade Flags of lower numbered varyings" size="2" start="4" type="Varying Flags Action"/>
     <field name="Varying offset V0" size="4" start="0" type="uint"/>
   </packet>
 
diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/vc5/vc5_emit.c
index b4486ef9268..53fa01b3f42 100644
--- a/src/gallium/drivers/vc5/vc5_emit.c
+++ b/src/gallium/drivers/vc5/vc5_emit.c
@@ -520,17 +520,17 @@ vc5_emit_state(struct pipe_context *pctx)
 
                                 if (emitted_any) {
                                         flags.action_for_flat_shade_flags_of_lower_numbered_varyings =
-                                                V3D_FLAT_SHADE_ACTION_UNCHANGED;
+                                                V3D_VARYING_FLAGS_ACTION_UNCHANGED;
                                         flags.action_for_flat_shade_flags_of_higher_numbered_varyings =
-                                                V3D_FLAT_SHADE_ACTION_UNCHANGED;
+                                                V3D_VARYING_FLAGS_ACTION_UNCHANGED;
                                 } else {
                                         flags.action_for_flat_shade_flags_of_lower_numbered_varyings =
                                                 ((i == 0) ?
-                                                 V3D_FLAT_SHADE_ACTION_UNCHANGED :
-                                                 V3D_FLAT_SHADE_ACTION_ZEROED);
+                                                 V3D_VARYING_FLAGS_ACTION_UNCHANGED :
+                                                 V3D_VARYING_FLAGS_ACTION_ZEROED);
 
                                         flags.action_for_flat_shade_flags_of_higher_numbered_varyings =
-                                                V3D_FLAT_SHADE_ACTION_ZEROED;
+                                                V3D_VARYING_FLAGS_ACTION_ZEROED;
                                 }
 
                                 flags.flat_shade_flags_for_varyings_v024 =
-- 
2.11.0