fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

asahi: rename compressed 1 to just compressed

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36399>
This commit is contained in:
Alyssa Rosenzweig 2025-07-30 14:54:07 -04:00
parent 74ed2b78e8
commit 700a88233b
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/asahi/genxml/cmdbuf.xml
View file

@ -232,7 +232,7 @@
<field name="Flip vertical" size="1" start="54" type="bool"/>
<field name="Samples" size="1" start="56" type="Sample Count"/>
<field name="Unk mipmapped" size="1" start="58" type="bool"/>
<field name="Compressed 1" size="1" start="59" type="bool"/>
<field name="Compressed" size="1" start="59" type="bool"/>
<field name="Mode" size="2" start="60" type="Image Mode"/>
<field name="Buffer" size="36" start="64" type="address" modifier="shr(4)"/>
<field name="Level" size="4" start="100" type="uint"/>
@ -294,7 +294,7 @@
to switch tile size (or disable tiling altogether?) at small mip levels to
reduce wasted memory due to padding. Causing test flakiness when set. -->
<field name="Unk mipmapped" size="1" start="102" type="bool"/>
<field name="Compressed 1" size="1" start="103" type="bool"/>
<field name="Compressed" size="1" start="103" type="bool"/>
<field name="Mode" size="2" start="104" type="Image Mode"/>
<field name="Compression" size="2" start="106" type="hex"/> <!-- 0 for uncompressed -->
<field name="sRGB" size="1" start="108" type="bool"/>

4
src/asahi/vulkan/hk_image_view.c
View file

@ -328,7 +328,7 @@ pack_texture(struct hk_image_view *view, unsigned view_plane,
cfg.srgb_2_channel = cfg.srgb && util_format_colormask(desc) == 0x3;
if (layout->compressed) {
cfg.compressed_1 = true;
cfg.compressed = true;
cfg.extended = true;
}
@ -482,7 +482,7 @@ pack_pbe(struct hk_device *dev, struct hk_image_view *view, unsigned view_plane,
}
if (layout->compressed && usage != HK_DESC_USAGE_EMRT) {
cfg.compressed_1 = true;
cfg.compressed = true;
cfg.extended = true;
cfg.acceleration_buffer = base_addr + layout->metadata_offset_B +

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

@ -716,10 +716,8 @@ agx_pack_texture(void *out, struct agx_resource *rsrc,
cfg.unk_mipmapped = rsrc->mipmapped;
cfg.srgb_2_channel = cfg.srgb && util_format_colormask(desc) == 0x3;
if (rsrc->layout.compressed) {
cfg.compressed_1 = true;
cfg.extended = true;
}
cfg.compressed = rsrc->layout.compressed;
cfg.extended = cfg.compressed;
cfg.address = agx_map_texture_gpu(rsrc, first_layer);
@ -1259,7 +1257,7 @@ agx_batch_upload_pbe(struct agx_batch *batch, struct agx_pbe_packed *out,
}
if (tex->layout.compressed && !emrt) {
cfg.compressed_1 = true;
cfg.compressed = true;
cfg.extended = true;
cfg.acceleration_buffer =