genxml: Add APIMODE_D3D missing enum values and improve consistency.

Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index c465288e891afd76555662ae72f3eed3bb1a0d87..cf94efc28debb21ba181a54dc648636391f23ae3 100644 (file)
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -787,6 +787,7 @@
     <field name="CLIP Enable" start="95" end="95" type="bool"/>
     <field name="API Mode" start="94" end="94" type="uint">
       <value name="APIMODE_OGL" value="0"/>
+      <value name="APIMODE_D3D" value="1"/>
     </field>
     <field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
     <field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>

diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index b1c324f66d4a20ed2c93b23ebae03d757697a948..108409393d94ab07d087e6c39de5d002eaa5f63c 100644 (file)
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -959,6 +959,7 @@
     <field name="Clip Enable" start="95" end="95" type="bool"/>
     <field name="API Mode" start="94" end="94" type="uint">
       <value name="APIMODE_OGL" value="0"/>
+      <value name="APIMODE_D3D" value="1"/>
     </field>
     <field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
     <field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>

diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 1239164d400fd66f5946ed650a3921c2b6fc057a..b7bf13a08d59a8ff94bf038fe02ea1974d0f5320 100644 (file)
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -1068,6 +1068,7 @@
     <field name="Clip Enable" start="95" end="95" type="bool"/>
     <field name="API Mode" start="94" end="94" type="uint">
       <value name="APIMODE_OGL" value="0"/>
+      <value name="APIMODE_D3D" value="1"/>
     </field>
     <field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
     <field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>

diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 386e8fce875d2bb908aae9bca29054ca93e79ebb..dfeda9462ea2e3a7e6eb4b8cb20b814c84502d4e 100644 (file)
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -1115,7 +1115,8 @@
     <field name="User Clip Distance Cull Test Enable Bitmask" start="32" end="39" type="uint"/>
     <field name="Clip Enable" start="95" end="95" type="bool"/>
     <field name="API Mode" start="94" end="94" type="uint">
-      <value name="OGL" value="0"/>
+      <value name="APIMODE_OGL" value="0"/>
+      <value name="APIMODE_D3D" value="1"/>
     </field>
     <field name="Viewport XY Clip Test Enable" start="92" end="92" type="bool"/>
     <field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/>

diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 896143b2f6453ca61565f6c6012b973c083460a1..06a3cd4de39d3e38c6e0a9a90bd2a7debed2e935 100644 (file)
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -1167,7 +1167,8 @@
     <field name="User Clip Distance Cull Test Enable Bitmask" start="32" end="39" type="uint"/>
     <field name="Clip Enable" start="95" end="95" type="bool"/>
     <field name="API Mode" start="94" end="94" type="uint">
-      <value name="OGL" value="0"/>
+      <value name="APIMODE_OGL" value="0"/>
+      <value name="APIMODE_D3D" value="1"/>
     </field>
     <field name="Viewport XY Clip Test Enable" start="92" end="92" type="bool"/>
     <field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/>

diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c
index 4e04aadfe898beacc7e355ca5ab083afaf541185..52792a9ad17fce4db09b7cbc6065170083fe555b 100644 (file)
--- a/src/intel/vulkan/gen8_pipeline.c
+++ b/src/intel/vulkan/gen8_pipeline.c
@@ -190,7 +190,7 @@ genX(graphics_pipeline_create)(
    anv_batch_emit(&pipeline->batch, GENX(3DSTATE_CLIP), clip) {
       clip.ClipEnable               = !(extra && extra->use_rectlist);
       clip.EarlyCullEnable          = true;
-      clip.APIMode                  = 1; /* D3D */
+      clip.APIMode                  = APIMODE_D3D;
       clip.ViewportXYClipTestEnable = true;
 
       clip.ClipMode =