Mesa (master): intel: Make Cube Face Enable fields consistent across generations.
Kenneth Graunke
kwg at kemper.freedesktop.org
Tue Oct 3 07:07:28 UTC 2017
Module: Mesa
Branch: master
Commit: 45cf049ba610f90476ddf2febff0634809ba0e1b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=45cf049ba610f90476ddf2febff0634809ba0e1b
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Sep 28 14:51:53 2017 -0700
intel: Make Cube Face Enable fields consistent across generations.
I decided to use the one-boolean-per-cube-face approach because it's
clearer which bits correspond to which cube face.
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/intel/genxml/gen4.xml | 7 ++++++-
src/intel/genxml/gen45.xml | 7 ++++++-
src/intel/genxml/gen5.xml | 7 ++++++-
src/intel/genxml/gen6.xml | 7 ++++++-
src/intel/genxml/gen7.xml | 7 ++++++-
src/intel/genxml/gen75.xml | 7 ++++++-
src/intel/isl/isl_surface_state.c | 4 ----
7 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index 6499346c99..fc24329535 100644
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -526,7 +526,12 @@
<field name="Media Boundary Pixel Mode" start="6" end="7" type="uint">
<value name="NORMAL_MODE" value="0"/>
</field>
- <field name="Cube Face Enables" start="0" end="5" type="uint"/>
+ <field name="Cube Face Enable - Positive Z" start="0" end="0" type="bool"/>
+ <field name="Cube Face Enable - Negative Z" start="1" end="1" type="bool"/>
+ <field name="Cube Face Enable - Positive Y" start="2" end="2" type="bool"/>
+ <field name="Cube Face Enable - Negative Y" start="3" end="3" type="bool"/>
+ <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
+ <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
<field name="Surface Base Address" start="32" end="63" type="address"/>
<field name="Height" start="83" end="95" type="uint"/>
<field name="Width" start="70" end="82" type="uint"/>
diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 0f90575407..c91085831e 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -531,7 +531,12 @@
<value name="PROGRESSIVE_FRAME" value="2"/>
<value name="INTERLACED_FRAME" value="3"/>
</field>
- <field name="Cube Face Enables" start="0" end="5" type="uint"/>
+ <field name="Cube Face Enable - Positive Z" start="0" end="0" type="bool"/>
+ <field name="Cube Face Enable - Negative Z" start="1" end="1" type="bool"/>
+ <field name="Cube Face Enable - Positive Y" start="2" end="2" type="bool"/>
+ <field name="Cube Face Enable - Negative Y" start="3" end="3" type="bool"/>
+ <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
+ <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
<field name="Surface Base Address" start="32" end="63" type="address"/>
<field name="Height" start="83" end="95" type="uint"/>
<field name="Width" start="70" end="82" type="uint"/>
diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index 70f50076ab..93e687a32b 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -636,7 +636,12 @@
<field name="Media Boundary Pixel Mode" start="6" end="7" type="uint">
<value name="NORMAL_MODE" value="0"/>
</field>
- <field name="Cube Face Enables" start="0" end="5" type="uint"/>
+ <field name="Cube Face Enable - Positive Z" start="0" end="0" type="bool"/>
+ <field name="Cube Face Enable - Negative Z" start="1" end="1" type="bool"/>
+ <field name="Cube Face Enable - Positive Y" start="2" end="2" type="bool"/>
+ <field name="Cube Face Enable - Negative Y" start="3" end="3" type="bool"/>
+ <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
+ <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
<field name="Surface Base Address" start="32" end="63" type="address"/>
<field name="Height" start="83" end="95" type="uint"/>
<field name="Width" start="70" end="82" type="uint"/>
diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 8aa0335505..96f4be784e 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -574,7 +574,12 @@
<value name="PROGRESSIVE_FRAME" value="2"/>
<value name="INTERLACED_FRAME" value="3"/>
</field>
- <field name="Cube Face Enables" start="0" end="5" type="uint"/>
+ <field name="Cube Face Enable - Positive Z" start="0" end="0" type="bool"/>
+ <field name="Cube Face Enable - Negative Z" start="1" end="1" type="bool"/>
+ <field name="Cube Face Enable - Positive Y" start="2" end="2" type="bool"/>
+ <field name="Cube Face Enable - Negative Y" start="3" end="3" type="bool"/>
+ <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
+ <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
<field name="Surface Base Address" start="32" end="63" type="address"/>
<field name="Height" start="83" end="95" type="uint"/>
<field name="Width" start="70" end="82" type="uint"/>
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 993d10264f..cc17018b58 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -638,7 +638,12 @@
<value name="PROGRESSIVE_FRAME" value="2"/>
<value name="INTERLACED_FRAME" value="3"/>
</field>
- <field name="Cube Face Enables" start="0" end="5" type="uint"/>
+ <field name="Cube Face Enable - Positive Z" start="0" end="0" type="bool"/>
+ <field name="Cube Face Enable - Negative Z" start="1" end="1" type="bool"/>
+ <field name="Cube Face Enable - Positive Y" start="2" end="2" type="bool"/>
+ <field name="Cube Face Enable - Negative Y" start="3" end="3" type="bool"/>
+ <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
+ <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
<field name="Surface Base Address" start="32" end="63" type="address"/>
<field name="Height" start="80" end="93" type="uint"/>
<field name="Width" start="64" end="77" type="uint"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 105effa8ce..cb408a2bb8 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -657,7 +657,12 @@
<value name="PROGRESSIVE_FRAME" value="2"/>
<value name="INTERLACED_FRAME" value="3"/>
</field>
- <field name="Cube Face Enables" start="0" end="5" type="uint"/>
+ <field name="Cube Face Enable - Positive Z" start="0" end="0" type="bool"/>
+ <field name="Cube Face Enable - Negative Z" start="1" end="1" type="bool"/>
+ <field name="Cube Face Enable - Positive Y" start="2" end="2" type="bool"/>
+ <field name="Cube Face Enable - Negative Y" start="3" end="3" type="bool"/>
+ <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
+ <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
<field name="Surface Base Address" start="32" end="63" type="address"/>
<field name="Height" start="80" end="93" type="uint"/>
<field name="Width" start="64" end="77" type="uint"/>
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index c6a55ce970..323cf206d2 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -453,16 +453,12 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
#endif
if (info->view->usage & ISL_SURF_USAGE_CUBE_BIT) {
-#if GEN_GEN >= 8
s.CubeFaceEnablePositiveZ = 1;
s.CubeFaceEnableNegativeZ = 1;
s.CubeFaceEnablePositiveY = 1;
s.CubeFaceEnableNegativeY = 1;
s.CubeFaceEnablePositiveX = 1;
s.CubeFaceEnableNegativeX = 1;
-#else
- s.CubeFaceEnables = 0x3f;
-#endif
}
#if GEN_GEN >= 6
More information about the mesa-commit
mailing list