From 273a10b3f1a41a11006aa116a810075add5daca4 Mon Sep 17 00:00:00 2001
From: Rafael Antognolli <rafael.antognolli@intel.com>
Date: Fri, 31 Mar 2017 15:25:20 -0700
Subject: genxml: Update xml for 3DSTATE_SF.

 - Normalize "Anti-Aliasing Enable"
 - Add "Multisample Rasterization Mode" constants
 - Rename "Use Point Width on Vertex" to "Vertex"
 - Rename "Use Point Width from State" to "State"

Signed-off-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/intel/genxml/gen6.xml | 15 ++++++++++-----
 src/intel/genxml/gen7.xml |  7 ++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 094887a3234..8ead41f2bcd 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -1215,7 +1215,7 @@
       <value name="FRONTWINDING_CW" value="0"/>
       <value name="FRONTWINDING_CCW" value="1"/>
     </field>
-    <field name="Anti-aliasing Enable" start="127" end="127" type="bool"/>
+    <field name="Anti-Aliasing Enable" start="127" end="127" type="bool"/>
     <field name="Cull Mode" start="125" end="126" type="uint" prefix="CULLMODE">
       <value name="BOTH" value="0"/>
       <value name="NONE" value="1"/>
@@ -1230,7 +1230,12 @@
       <value name="4.0 pixels" value="3"/>
     </field>
     <field name="Scissor Rectangle Enable" start="107" end="107" type="bool"/>
-    <field name="Multisample Rasterization Mode" start="104" end="105" type="uint"/>
+    <field name="Multisample Rasterization Mode" start="104" end="105" type="uint">
+      <value name="MSRASTMODE_OFF_PIXEL" value="0"/>
+      <value name="MSRASTMODE_OFF_PATTERN" value="1"/>
+      <value name="MSRASTMODE_ON_PIXEL" value="2"/>
+      <value name="MSRASTMODE_ON_PATTERN" value="3"/>
+    </field>
     <field name="Last Pixel Enable" start="159" end="159" type="bool"/>
     <field name="Triangle Strip/List Provoking Vertex Select" start="157" end="158" type="uint">
       <value name="Vertex 0" value="0"/>
@@ -1253,9 +1258,9 @@
       <value name="8 Sub-Pixel Precision Bits" value="0"/>
       <value name="4 Sub-Pixel Precision Bits" value="1"/>
     </field>
-    <field name="Use Point Width State" start="139" end="139" type="uint">
-      <value name="Use Point Width on Vertex" value="0"/>
-      <value name="Use Point Width from State" value="1"/>
+    <field name="Point Width Source" start="139" end="139" type="uint">
+      <value name="Vertex" value="0"/>
+      <value name="State" value="1"/>
     </field>
     <field name="Point Width" start="128" end="138" type="u8.3"/>
     <field name="Global Depth Offset Constant" start="160" end="191" type="float"/>
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 867a1d40921..440258a8df3 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -1602,7 +1602,12 @@
       <value name="4.0 pixels" value="3"/>
     </field>
     <field name="Scissor Rectangle Enable" start="75" end="75" type="bool"/>
-    <field name="Multisample Rasterization Mode" start="72" end="73" type="uint"/>
+    <field name="Multisample Rasterization Mode" start="72" end="73" type="uint">
+      <value name="MSRASTMODE_OFF_PIXEL" value="0"/>
+      <value name="MSRASTMODE_OFF_PATTERN" value="1"/>
+      <value name="MSRASTMODE_ON_PIXEL" value="2"/>
+      <value name="MSRASTMODE_ON_PATTERN" value="3"/>
+   </field>
     <field name="Last Pixel Enable" start="127" end="127" type="bool"/>
     <field name="Triangle Strip/List Provoking Vertex Select" start="125" end="126" type="uint">
       <value name="Vertex 0" value="0"/>
-- 
cgit v1.2.3