From 193c1b72e04c131a4b9a9862aad42f5058a7c373 Mon Sep 17 00:00:00 2001
From: "Kristian H. Kristensen" <hoegsberg@gmail.com>
Date: Mon, 28 Nov 2016 16:59:46 -0800
Subject: [PATCH] intel/genxml: Use enum SURFACE_FORMAT where applicable

Signed-off-by: Kristian H. Kristensen <hoegsberg@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---
 src/intel/genxml/gen6.xml  | 4 ++--
 src/intel/genxml/gen7.xml  | 4 ++--
 src/intel/genxml/gen75.xml | 4 ++--
 src/intel/genxml/gen8.xml  | 4 ++--
 src/intel/genxml/gen9.xml  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index a6a273731e7..732a76c40e1 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -302,7 +302,7 @@
   <struct name="VERTEX_ELEMENT_STATE" length="2">
     <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
     <field name="Valid" start="25" end="25" type="bool"/>
-    <field name="Source Element Format" start="16" end="24" type="uint"/>
+    <field name="Source Element Format" start="16" end="24" type="SURFACE_FORMAT"/>
     <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
     <field name="Source Element Offset" start="0" end="11" type="uint"/>
     <field name="Component 0 Control" start="60" end="62" type="uint"/>
@@ -560,7 +560,7 @@
     <field name="Data Return Format" start="27" end="27" type="uint">
       <value name="DATA_RETURN_FLOAT32" value="0"/>
     </field>
-    <field name="Surface Format" start="18" end="26" type="uint"/>
+    <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
     <field name="Vertical Line Stride" start="12" end="12" type="uint"/>
     <field name="Vertical Line Stride Offset" start="11" end="11" type="uint"/>
     <field name="MIP Map Layout Mode" start="10" end="10" type="uint">
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 3b41de903b1..dd63742fec2 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -348,7 +348,7 @@
   <struct name="VERTEX_ELEMENT_STATE" length="2">
     <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
     <field name="Valid" start="25" end="25" type="bool"/>
-    <field name="Source Element Format" start="16" end="24" type="uint"/>
+    <field name="Source Element Format" start="16" end="24" type="SURFACE_FORMAT"/>
     <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
     <field name="Source Element Offset" start="0" end="11" type="uint"/>
     <field name="Component 0 Control" start="60" end="62" type="uint"/>
@@ -620,7 +620,7 @@
       <value name="SURFTYPE_NULL" value="7"/>
     </field>
     <field name="Surface Array" start="28" end="28" type="bool"/>
-    <field name="Surface Format" start="18" end="26" type="uint"/>
+    <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
     <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
       <value name="VALIGN_2" value="0"/>
       <value name="VALIGN_4" value="1"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index ec1621bbf37..b5e27d08de2 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -358,7 +358,7 @@
   <struct name="VERTEX_ELEMENT_STATE" length="2">
     <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
     <field name="Valid" start="25" end="25" type="bool"/>
-    <field name="Source Element Format" start="16" end="24" type="uint"/>
+    <field name="Source Element Format" start="16" end="24" type="SURFACE_FORMAT"/>
     <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
     <field name="Source Element Offset" start="0" end="11" type="uint"/>
     <field name="Component 0 Control" start="60" end="62" type="uint"/>
@@ -630,7 +630,7 @@
       <value name="SURFTYPE_NULL" value="7"/>
     </field>
     <field name="Surface Array" start="28" end="28" type="bool"/>
-    <field name="Surface Format" start="18" end="26" type="uint"/>
+    <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
     <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
       <value name="VALIGN_2" value="0"/>
       <value name="VALIGN_4" value="1"/>
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index d90de08ab1a..2695721bd4d 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -453,7 +453,7 @@
   <struct name="VERTEX_ELEMENT_STATE" length="2">
     <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
     <field name="Valid" start="25" end="25" type="bool"/>
-    <field name="Source Element Format" start="16" end="24" type="uint"/>
+    <field name="Source Element Format" start="16" end="24" type="SURFACE_FORMAT"/>
     <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
     <field name="Source Element Offset" start="0" end="11" type="uint"/>
     <field name="Component 0 Control" start="60" end="62" type="uint"/>
@@ -659,7 +659,7 @@
       <value name="SURFTYPE_NULL" value="7"/>
     </field>
     <field name="Surface Array" start="28" end="28" type="bool"/>
-    <field name="Surface Format" start="18" end="26" type="uint"/>
+    <field name="Surface Format" start="18" end="26" type="SURFACE_FORMAT"/>
     <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
       <value name="VALIGN 4" value="1"/>
       <value name="VALIGN 8" value="2"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index ec16d73b611..b9dcc548fb6 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -462,7 +462,7 @@
   <struct name="VERTEX_ELEMENT_STATE" length="2">
     <field name="Vertex Buffer Index" start="26" end="31" type="uint"/>
     <field name="Valid" start="25" end="25" type="bool"/>
-    <field name="Source Element Format" start="16" end="24" type="uint"/>
+    <field name="Source Element Format" start="16" end="24" type="SURFACE_FORMAT"/>
     <field name="Edge Flag Enable" start="15" end="15" type="bool"/>
     <field name="Source Element Offset" start="0" end="11" type="uint"/>
     <field name="Component 0 Control" start="60" end="62" type="uint"/>
@@ -685,7 +685,7 @@
       <value name="SURFTYPE_NULL" value="7"/>
     </field>
     <field name="Surface Array" start="28" end="28" type="bool"/>
-    <field name="Surface Format" start="18" end="27" type="uint"/>
+    <field name="Surface Format" start="18" end="27" type="SURFACE_FORMAT"/>
     <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
       <value name="VALIGN 4" value="1"/>
       <value name="VALIGN 8" value="2"/>
-- 
2.30.2