intel/genxml: Make some 3DSTATE_GS fields more consistent

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 980a74ceaa468c4ea630b63e1c05cc2565f774d5..ad130d95738c32fdb430430c8f9e45d67850a741 100644 (file)
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -1049,7 +1049,7 @@
     <field name="Vertex URB Entry Read Offset" start="132" end="137" type="uint"/>
     <field name="Dispatch GRF Start Register For URB Data" start="128" end="131" type="uint"/>
     <field name="Maximum Number of Threads" start="185" end="191" type="uint"/>
-    <field name="GS Statistics Enable" start="170" end="170" type="bool"/>
+    <field name="Statistics Enable" start="170" end="170" type="bool"/>
     <field name="SO Statistics Enable" start="169" end="169" type="bool"/>
     <field name="Rendering Enabled" start="168" end="168" type="uint"/>
     <field name="Reorder Enable" start="222" end="222" type="bool"/>
@@ -1057,7 +1057,7 @@
     <field name="SVBI Payload Enable" start="220" end="220" type="bool"/>
     <field name="SVBI Post-Increment Enable" start="219" end="219" type="bool"/>
     <field name="SVBI Post-Increment Value" start="208" end="217" type="uint"/>
-    <field name="GS Enable" start="207" end="207" type="bool"/>
+    <field name="Function Enable" start="207" end="207" type="bool"/>
   </instruction>
 
   <instruction name="3DSTATE_GS_SVB_INDEX" bias="2" length="7">

diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index ffcf8d483783a3a349d415acb6699fd8d50c0402..9bf3814344594e2b1b28145fc9cda822066657ec 100644 (file)
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -1195,13 +1195,13 @@
       <value name="DUAL_INSTANCE" value="1"/>
       <value name="DUAL_OBJECT" value="2"/>
     </field>
-    <field name="GS Statistics Enable" start="170" end="170" type="uint"/>
+    <field name="Statistics Enable" start="170" end="170" type="uint"/>
     <field name="GS Invocations Increment Value" start="165" end="169" type="uint"/>
     <field name="Include Primitive ID" start="164" end="164" type="bool"/>
     <field name="Hint" start="163" end="163" type="uint"/>
     <field name="Reorder Enable" start="162" end="162" type="bool"/>
     <field name="Discard Adjacency" start="161" end="161" type="bool"/>
-    <field name="GS Enable" start="160" end="160" type="bool"/>
+    <field name="Function Enable" start="160" end="160" type="bool"/>
     <field name="Semaphore Handle" start="192" end="203" type="offset"/>
   </instruction>
 

diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index c4839eba776d478bf41cb0a53a6f1b2f04683257..280e7c4aba3d3fd47d7baf04d816022f964671da 100644 (file)
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -1410,16 +1410,16 @@
       <value name="DUAL_INSTANCE" value="1"/>
       <value name="DUAL_OBJECT" value="2"/>
     </field>
-    <field name="GS Statistics Enable" start="170" end="170" type="uint"/>
+    <field name="Statistics Enable" start="170" end="170" type="uint"/>
     <field name="GS Invocations Increment Value" start="165" end="169" type="uint"/>
     <field name="Include Primitive ID" start="164" end="164" type="bool"/>
     <field name="Hint" start="163" end="163" type="uint"/>
     <field name="Reorder Mode" start="162" end="162" type="uint">
-      <value name="REORDER_LEADING" value="0"/>
-      <value name="REORDER_TRAILING" value="1"/>
+      <value name="LEADING" value="0"/>
+      <value name="TRAILING" value="1"/>
     </field>
     <field name="Discard Adjacency" start="161" end="161" type="bool"/>
-    <field name="GS Enable" start="160" end="160" type="bool"/>
+    <field name="Function Enable" start="160" end="160" type="bool"/>
     <field name="Control Data Format" start="223" end="223" type="uint">
       <value name="GSCTL_CUT" value="0"/>
       <value name="GSCTL_SID" value="1"/>

diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 73c92651dde5313c04321153d584abc73b696d11..f4dda4e9954525e9cbf26f2d21951d4e9427bac5 100644 (file)
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -1446,7 +1446,7 @@
       <value name="TRAILING" value="1"/>
     </field>
     <field name="Discard Adjacency" start="225" end="225" type="bool"/>
-    <field name="Enable" start="224" end="224" type="bool"/>
+    <field name="Function Enable" start="224" end="224" type="bool"/>
     <field name="Control Data Format" start="287" end="287" type="uint">
       <value name="CUT" value="0"/>
       <value name="SID" value="1"/>

diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 0dfce3fb17671ec48671dfc9734b35c1ab648177..58b41f71dd99245fc709fcb02a6ee05ec3e12259 100644 (file)
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -1548,7 +1548,7 @@
       <value name="TRAILING" value="1"/>
     </field>
     <field name="Discard Adjacency" start="225" end="225" type="bool"/>
-    <field name="Enable" start="224" end="224" type="bool"/>
+    <field name="Function Enable" start="224" end="224" type="bool"/>
     <field name="Control Data Format" start="287" end="287" type="uint">
       <value name="CUT" value="0"/>
       <value name="SID" value="1"/>

diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c
index d747c514f857d503aa2f781cc65c7f8aa14e0676..c965c5f13773c71b5f98de1dce8055e38aab60f4 100644 (file)
--- a/src/intel/vulkan/gen7_pipeline.c
+++ b/src/intel/vulkan/gen7_pipeline.c
@@ -142,14 +142,14 @@ genX(graphics_pipeline_create)(
          gs.ControlDataHeaderSize      = gs_prog_data->control_data_header_size_hwords;
          gs.InstanceControl            = MAX2(gs_prog_data->invocations, 1) - 1;
          gs.DispatchMode               = gs_prog_data->base.dispatch_mode;
-         gs.GSStatisticsEnable         = true;
+         gs.StatisticsEnable           = true;
          gs.IncludePrimitiveID         = gs_prog_data->include_primitive_id;
 #     if (GEN_IS_HASWELL)
-         gs.ReorderMode                = REORDER_TRAILING;
+         gs.ReorderMode                = TRAILING;
 #     else
          gs.ReorderEnable              = true;
 #     endif
-         gs.GSEnable                   = true;
+         gs.FunctionEnable             = true;
       }
    }
 

diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c
index 827ee512396b595ee2e8e466f6893478cb9414cd..1320a1377af54e7b741719504b82c62ed3516bd8 100644 (file)
--- a/src/intel/vulkan/gen8_pipeline.c
+++ b/src/intel/vulkan/gen8_pipeline.c
@@ -151,7 +151,7 @@ genX(graphics_pipeline_create)(
          gs.StatisticsEnable        = true;
          gs.IncludePrimitiveID      = gs_prog_data->include_primitive_id;
          gs.ReorderMode             = TRAILING;
-         gs.Enable                  = true;
+         gs.FunctionEnable          = true;
 
          gs.ControlDataFormat       = gs_prog_data->control_data_format;