Mesa (master): genxml: Add APIMODE_D3D missing enum values and improve consistency.
Kenneth Graunke
kwg at kemper.freedesktop.org
Wed Jul 20 17:59:56 UTC 2016
Module: Mesa
Branch: master
Commit: 6b6727026228bd1eab715034416194317e4d0fc6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b6727026228bd1eab715034416194317e4d0fc6
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Jul 18 13:56:23 2016 -0700
genxml: Add APIMODE_D3D missing enum values and improve consistency.
Cc: "12.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/intel/genxml/gen6.xml | 1 +
src/intel/genxml/gen7.xml | 1 +
src/intel/genxml/gen75.xml | 1 +
src/intel/genxml/gen8.xml | 3 ++-
src/intel/genxml/gen9.xml | 3 ++-
src/intel/vulkan/gen8_pipeline.c | 2 +-
6 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index c465288..cf94efc 100644
--- 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 b1c324f..1084093 100644
--- 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 1239164..b7bf13a 100644
--- 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 386e8fc..dfeda94 100644
--- 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 896143b..06a3cd4 100644
--- 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 4e04aad..52792a9 100644
--- 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 =
More information about the mesa-commit
mailing list