summaryrefslogtreecommitdiff
path: root/rnndb
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-08-08 22:11:22 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2013-08-09 07:16:08 +0200
commit5ea71afec8970beb984ae2a52c091b49c5453b1c (patch)
tree8f20d540cb7bdddda601535011a0a67d794b0ad8 /rnndb
parentaa4cef4249d5320de3f98778f076cd263c230c27 (diff)
driver: texture alignment, preparation for multi-pipe
Correct texture and RS alignment. For multi-tiled and multi-super-tiled surfaces (for multiple pixel pipes) a special texture format is used.
Diffstat (limited to 'rnndb')
-rw-r--r--rnndb/common.xml2
-rw-r--r--rnndb/state_3d.xml10
2 files changed, 10 insertions, 2 deletions
diff --git a/rnndb/common.xml b/rnndb/common.xml
index 26be78a..2349ccf 100644
--- a/rnndb/common.xml
+++ b/rnndb/common.xml
@@ -173,7 +173,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
<bitfield pos="17" name="BUG_FIXES5"/>
<bitfield pos="18" name="NEW_2D" brief="Mirror extension available"/>
<bitfield pos="19" name="NEW_FP" brief="New floating point arithmetic"/>
- <bitfield pos="20" name="TEXTURE_ALIGN_4" brief="Textures can be aligned to 4 instead of 16"/>
+ <bitfield pos="20" name="TEXTURE_HALIGN" brief="Textures can specify horizontal alignment"/>
<bitfield pos="21" name="NON_POWER_OF_TWO" brief="Non power-of-two texture support"/>
<bitfield pos="22" name="LINEAR_TEXTURE_SUPPORT"/>
<bitfield pos="23" name="HALTI0" brief="Various features related to texturing and vertex processing">
diff --git a/rnndb/state_3d.xml b/rnndb/state_3d.xml
index a28568f..73613d0 100644
--- a/rnndb/state_3d.xml
+++ b/rnndb/state_3d.xml
@@ -138,7 +138,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
<value value="3" name="ANISOTROPIC"/><!-- Only supported if HALTI0 feature bit set -->
</enum>
<enum name="TEXTURE_TYPE">
- <!-- 0 shows up as black -->
+ <value value="0" name="NONE"/> <!-- 0 shows up as black -->
<!-- 1 crashes GPU -->
<value value="2" name="2D"/>
<!-- 3 crashes GPU -->
@@ -171,6 +171,13 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
<value value="4" name="ZERO"/>
<value value="5" name="ONE"/>
</enum>
+ <enum name="TEXTURE_HALIGN">
+ <value value="0" name="FOUR"/>
+ <value value="1" name="SIXTEEN"/>
+ <value value="2" name="SUPER_TILED"/>
+ <value value="3" name="SPLIT_TILED"/>
+ <value value="4" name="SPLIT_SUPER_TILED"/>
+ </enum>
<enum name="LOGIC_OP" brief="LogicOp">
<value value="0" name="CLEAR"/>
<value value="1" name="NOR"/>
@@ -827,6 +834,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
<bitfield high="14" low="12" name="SWIZZLE_G" type="TEXTURE_SWIZZLE"/>
<bitfield high="18" low="16" name="SWIZZLE_B" type="TEXTURE_SWIZZLE"/>
<bitfield high="22" low="20" name="SWIZZLE_A" type="TEXTURE_SWIZZLE"/>
+ <bitfield high="28" low="26" name="HALIGN" type="TEXTURE_HALIGN"/>
</bitset>
<stripe name="TE" brief="TExture sampler states">
<doc>Texture sampling, filtering, LOD, etc</doc>