From 6136fb8687d216565ea481875e651ff23b13bfd3 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 6 Aug 2016 08:24:00 -0700
Subject: [PATCH] genxml: Make 3DSTATE_SF more consistent between gen7 and
 gen8+

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/intel/genxml/gen7.xml        | 7 +++++--
 src/intel/genxml/gen75.xml       | 7 +++++--
 src/intel/vulkan/gen7_pipeline.c | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 1084093..5e82fab 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -1612,7 +1612,7 @@
       <value name="WIREFRAME" value="1"/>
       <value name="POINT" value="2"/>
     </field>
-    <field name="View Transform Enable" start="33" end="33" type="bool"/>
+    <field name="Viewport Transform Enable" start="33" end="33" type="bool"/>
     <field name="Front Winding" start="32" end="32" type="uint"/>
     <field name="Anti-Aliasing Enable" start="95" end="95" type="bool"/>
     <field name="Cull Mode" start="93" end="94" type="uint" prefix="CULLMODE">
@@ -1641,7 +1641,10 @@
       <value name="AALINEDISTANCE_TRUE" value="1"/>
     </field>
     <field name="Vertex Sub Pixel Precision Select" start="108" end="108" type="uint"/>
-    <field name="Use Point Width State" start="107" end="107" type="uint"/>
+    <field name="Point Width Source" start="107" end="107" type="uint">
+      <value name="Vertex" value="0"/>
+      <value name="State" value="1"/>
+    </field>
     <field name="Point Width" start="96" end="106" type="u8.3"/>
     <field name="Global Depth Offset Constant" start="128" end="159" type="float"/>
     <field name="Global Depth Offset Scale" start="160" end="191" type="float"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index b7bf13a..f1be2f8 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -1857,7 +1857,7 @@
       <value name="WIREFRAME" value="1"/>
       <value name="POINT" value="2"/>
     </field>
-    <field name="View Transform Enable" start="33" end="33" type="bool"/>
+    <field name="Viewport Transform Enable" start="33" end="33" type="bool"/>
     <field name="Front Winding" start="32" end="32" type="uint"/>
     <field name="Anti-Aliasing Enable" start="95" end="95" type="bool"/>
     <field name="Cull Mode" start="93" end="94" type="uint" prefix="CULLMODE">
@@ -1888,7 +1888,10 @@
       <value name="AALINEDISTANCE_TRUE" value="1"/>
     </field>
     <field name="Vertex Sub Pixel Precision Select" start="108" end="108" type="uint"/>
-    <field name="Use Point Width State" start="107" end="107" type="uint"/>
+    <field name="Point Width Source" start="107" end="107" type="uint">
+      <value name="Vertex" value="0"/>
+      <value name="State" value="1"/>
+    </field>
     <field name="Point Width" start="96" end="106" type="u8.3"/>
     <field name="Global Depth Offset Constant" start="128" end="159" type="float"/>
     <field name="Global Depth Offset Scale" start="160" end="191" type="float"/>
diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c
index daebc27..6b57dd6 100644
--- a/src/intel/vulkan/gen7_pipeline.c
+++ b/src/intel/vulkan/gen7_pipeline.c
@@ -47,7 +47,7 @@ gen7_emit_rs_state(struct anv_pipeline *pipeline,
       .StatisticsEnable                         = true,
       .FrontFaceFillMode                        = vk_to_gen_fillmode[info->polygonMode],
       .BackFaceFillMode                         = vk_to_gen_fillmode[info->polygonMode],
-      .ViewTransformEnable                      = !(extra && extra->use_rectlist),
+      .ViewportTransformEnable                  = !(extra && extra->use_rectlist),
       .FrontWinding                             = vk_to_gen_front_face[info->frontFace],
       /* bool                                         AntiAliasingEnable; */
 
@@ -65,7 +65,7 @@ gen7_emit_rs_state(struct anv_pipeline *pipeline,
 
       /* uint32_t                                     AALineDistanceMode; */
       /* uint32_t                                     VertexSubPixelPrecisionSelect; */
-      .UsePointWidthState                       = false,
+      .PointWidthSource                         = Vertex,
       .PointWidth                               = 1.0,
       .GlobalDepthOffsetEnableSolid             = info->depthBiasEnable,
       .GlobalDepthOffsetEnableWireframe         = info->depthBiasEnable,
-- 
2.7.4