Mesa (main): pvr: csbgen: Make all generated enums unambiguous
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jun 23 15:39:30 UTC 2022
Module: Mesa
Branch: main
Commit: 29a7d924c7a4f5d819b961c1cd3bd0c2060789a5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=29a7d924c7a4f5d819b961c1cd3bd0c2060789a5
Author: Matt Coster <matt.coster at imgtec.com>
Date: Thu May 26 10:04:40 2022 +0100
pvr: csbgen: Make all generated enums unambiguous
This change involves two enums:
* rogue_texstate.xml: All COMPRESSED_* members of FORMAT are moved
to FORMAT_COMPRESSED (without the prefix). A second field is added
to IMAGE_WORD0 (texformat_compressed) which overlaps with the
original (texformat), and
* rogue_pbestate.xml: REG_WORD0_LINESTRIDE was not a real enum; it's
removed entirely. It only has value when feature
pbe_stride_align_1pixel is present, so a FIXME comment was added to
this effect.
Signed-off-by: Matt Coster <matt.coster at imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil at imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17204>
---
src/imagination/csbgen/rogue_pbestate.xml | 8 +---
src/imagination/csbgen/rogue_texstate.xml | 75 ++++++++++++++++---------------
2 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/src/imagination/csbgen/rogue_pbestate.xml b/src/imagination/csbgen/rogue_pbestate.xml
index 29346d249dc..6e3d290797d 100644
--- a/src/imagination/csbgen/rogue_pbestate.xml
+++ b/src/imagination/csbgen/rogue_pbestate.xml
@@ -127,13 +127,6 @@ SOFTWARE.
<value name="ENABLED" value="1"/>
</enum>
- <enum name="REG_WORD0_LINESTRIDE">
- <value name="ALIGNSHIFT" value="1"/>
- <value name="ALIGNSIZE" value="2"/>
- <value name="ALIGNSHIFT_PBE_STRIDE_ALIGN_1PIXEL_ENABLED" value="0"/>
- <value name="ALIGNSIZE_PBE_STRIDE_ALIGN_1PIXEL_ENABLED" value="1"/>
- </enum>
-
<enum name="ROTATION_TYPE">
<value name="0_DEG" value="0"/>
<value name="90_DEG" value="1"/>
@@ -263,6 +256,7 @@ SOFTWARE.
<field name="size_z" start="52" end="55" type="SIZE"/>
<field name="rotation" start="50" end="51" type="ROTATION_TYPE"/>
<field name="linestride" start="34" end="49" type="uint">
+ <!-- FIXME: When pbe_stride_align_1pixel is present, this should be 1. -->
<define name="UNIT_SIZE" value="2"/>
</field>
<field name="memlayout" start="32" end="33" type="MEMLAYOUT"/>
diff --git a/src/imagination/csbgen/rogue_texstate.xml b/src/imagination/csbgen/rogue_texstate.xml
index f11eab48455..8f2fc0f0fa3 100644
--- a/src/imagination/csbgen/rogue_texstate.xml
+++ b/src/imagination/csbgen/rogue_texstate.xml
@@ -189,44 +189,48 @@ SOFTWARE.
<value name="YVU8_420_2PLANE_PACK8_P" value="120"/>
<value name="YUV8_420_2PLANE_PACK8_F" value="121"/>
<value name="YVU8_420_2PLANE_PACK8_F" value="122"/>
- <value name="COMPRESSED_ASTC_4x4" value="0"/>
- <value name="COMPRESSED_ASTC_5x4" value="1"/>
- <value name="COMPRESSED_ASTC_5x5" value="2"/>
- <value name="COMPRESSED_ASTC_6x5" value="3"/>
- <value name="COMPRESSED_ASTC_6x6" value="4"/>
- <value name="COMPRESSED_ASTC_8x5" value="5"/>
- <value name="COMPRESSED_ASTC_8x6" value="6"/>
- <value name="COMPRESSED_ASTC_8x8" value="7"/>
- <value name="COMPRESSED_ASTC_10x5" value="8"/>
- <value name="COMPRESSED_ASTC_10x6" value="9"/>
- <value name="COMPRESSED_ASTC_10x8" value="10"/>
- <value name="COMPRESSED_ASTC_10x10" value="11"/>
- <value name="COMPRESSED_ASTC_12x10" value="12"/>
- <value name="COMPRESSED_ASTC_12x12" value="13"/>
- <value name="COMPRESSED_PVRT2BPP" value="40"/>
- <value name="COMPRESSED_PVRT4BPP" value="41"/>
- <value name="COMPRESSED_PVRTII2BPP" value="42"/>
- <value name="COMPRESSED_PVRTII4BPP" value="43"/>
- <value name="COMPRESSED_UBC1" value="44"/>
- <value name="COMPRESSED_UBC2" value="45"/>
- <value name="COMPRESSED_UBC3" value="46"/>
- <value name="COMPRESSED_UBC4" value="47"/>
- <value name="COMPRESSED_SBC4" value="48"/>
- <value name="COMPRESSED_UBC5" value="49"/>
- <value name="COMPRESSED_SBC5" value="50"/>
- <value name="COMPRESSED_UBC6" value="51"/>
- <value name="COMPRESSED_SBC6" value="52"/>
- <value name="COMPRESSED_UBC7" value="53"/>
- <value name="COMPRESSED_ETC2_RGB" value="68"/>
- <value name="COMPRESSED_ETC2A_RGBA" value="69"/>
- <value name="COMPRESSED_ETC2_PUNCHTHROUGHA" value="70"/>
- <value name="COMPRESSED_EAC_R11_UNSIGNED" value="71"/>
- <value name="COMPRESSED_EAC_R11_SIGNED" value="72"/>
- <value name="COMPRESSED_EAC_RG11_UNSIGNED" value="73"/>
- <value name="COMPRESSED_EAC_RG11_SIGNED" value="74"/>
<value name="INVALID" value="0xFFFFFFFF"/>
</enum>
+ <enum name="FORMAT_COMPRESSED">
+ <value name="ASTC_4x4" value="0"/>
+ <value name="ASTC_5x4" value="1"/>
+ <value name="ASTC_5x5" value="2"/>
+ <value name="ASTC_6x5" value="3"/>
+ <value name="ASTC_6x6" value="4"/>
+ <value name="ASTC_8x5" value="5"/>
+ <value name="ASTC_8x6" value="6"/>
+ <value name="ASTC_8x8" value="7"/>
+ <value name="ASTC_10x5" value="8"/>
+ <value name="ASTC_10x6" value="9"/>
+ <value name="ASTC_10x8" value="10"/>
+ <value name="ASTC_10x10" value="11"/>
+ <value name="ASTC_12x10" value="12"/>
+ <value name="ASTC_12x12" value="13"/>
+ <value name="PVRT2BPP" value="40"/>
+ <value name="PVRT4BPP" value="41"/>
+ <value name="PVRTII2BPP" value="42"/>
+ <value name="PVRTII4BPP" value="43"/>
+ <value name="UBC1" value="44"/>
+ <value name="UBC2" value="45"/>
+ <value name="UBC3" value="46"/>
+ <value name="UBC4" value="47"/>
+ <value name="SBC4" value="48"/>
+ <value name="UBC5" value="49"/>
+ <value name="SBC5" value="50"/>
+ <value name="UBC6" value="51"/>
+ <value name="SBC6" value="52"/>
+ <value name="UBC7" value="53"/>
+ <value name="ETC2_RGB" value="68"/>
+ <value name="ETC2A_RGBA" value="69"/>
+ <value name="ETC2_PUNCHTHROUGHA" value="70"/>
+ <value name="EAC_R11_UNSIGNED" value="71"/>
+ <value name="EAC_R11_SIGNED" value="72"/>
+ <value name="EAC_RG11_UNSIGNED" value="73"/>
+ <value name="EAC_RG11_SIGNED" value="74"/>
+ <value name="INVALID" value="0xFFFFFFFF"/>
+ </enum>
+
<enum name="GAMMA">
<value name="OFF" value="0"/>
<value name="ON" value="1"/>
@@ -262,6 +266,7 @@ SOFTWARE.
<field name="height" start="48" end="61" type="uint"/>
<field name="width" start="34" end="47" type="uint"/>
<field name="texformat" start="27" end="33" type="FORMAT"/>
+ <field name="texformat_compressed" start="27" end="33" type="FORMAT_COMPRESSED"/>
<field name="minlod" start="17" end="26" type="uint"/>
<field name="swiz0" start="14" end="16" type="SWIZ"/>
<field name="swiz1" start="11" end="13" type="SWIZ"/>
More information about the mesa-commit
mailing list