fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-22 02:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

intel: Make Cube Face Enable fields consistent across generations.

Browse source 
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@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2017-09-28 14:51:53 -07:00
parent d400348c73
commit 45cf049ba6
7 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/intel/genxml/gen4.xml
View file

@ -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"/>

7
src/intel/genxml/gen45.xml
View file

@ -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"/>

7
src/intel/genxml/gen5.xml
View file

@ -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"/>

7
src/intel/genxml/gen6.xml
View file

@ -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"/>

7
src/intel/genxml/gen7.xml
View file

@ -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"/>

7
src/intel/genxml/gen75.xml
View file

@ -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"/>

4
src/intel/isl/isl_surface_state.c
View file

@ -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