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

asahi: Rename 'tiled 64x64' to 'twiddled'

Browse source 
To account for non-64x64 tile sizes, as well as the other forms of
tiling that may come up with compression.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18167>
This commit is contained in:
Alyssa Rosenzweig 2022-08-20 13:10:49 -04:00 • committed by Marge Bot
parent 88eea62adb
commit c8435e4bc6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/asahi/lib/cmdbuf.xml
View file

@ -69,8 +69,8 @@
<value name="Linear" value="0"/> <value name="Linear" value="0"/>
<!-- Default layout if no other layout is set --> <!-- Default layout if no other layout is set -->
<value name="Null" value="1"/> <value name="Null" value="1"/>
<!-- Morton order with 64x64 tiles --> <!-- Morton order -->
<value name="Tiled 64x64" value="2"/> <value name="Twiddled" value="2"/>
<!-- With a metadata buffer --> <!-- With a metadata buffer -->
<value name="Compressed" value="3"/> <value name="Compressed" value="3"/>
</enum> </enum>
@ -222,7 +222,7 @@
<field name="Unk mipmapped" size="1" start="102" type="bool"/> <field name="Unk mipmapped" size="1" start="102" type="bool"/>
<!-- This is set when no texture is bound, with layout 1 --> <!-- This is set when no texture is bound, with layout 1 -->
<field name="Null" size="1" start="105" type="bool"/> <field name="Null" size="1" start="105" type="bool"/>
<field name="Compression" size="2" start="106" type="hex"/> <!-- 0 for 64x64 tiling --> <field name="Compression" size="2" start="106" type="hex"/> <!-- 0 for uncompressed -->
<field name="sRGB" size="1" start="108" type="bool"/> <field name="sRGB" size="1" start="108" type="bool"/>
<field name="Unk 2" size="1" start="109" type="bool"/> <field name="Unk 2" size="1" start="109" type="bool"/>
<field name="Stride" size="18" start="110" type="hex" modifier="shr(4)"/> <field name="Stride" size="18" start="110" type="hex" modifier="shr(4)"/>

2
src/gallium/drivers/asahi/agx_state.c
View file

@ -409,7 +409,7 @@ agx_translate_layout(uint64_t modifier)
{ {
switch (modifier) { switch (modifier) {
case DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER: case DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER:
return AGX_LAYOUT_TILED_64X64; return AGX_LAYOUT_TWIDDLED;
case DRM_FORMAT_MOD_LINEAR: case DRM_FORMAT_MOD_LINEAR:
return AGX_LAYOUT_LINEAR; return AGX_LAYOUT_LINEAR;
default: default: