AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asahi: Fix "stride" for tiled textures

Browse Source 
It doesn't exist, but there's a count of mip levels for writeable image
descs. Setting that appropriately matters at high mip levels.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18380>
This commit is contained in:
Alyssa Rosenzweig
2022-09-02 23:19:54 -04:00
committed by Marge Bot
parent 4442be1155
commit 1d72d3feb6
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/asahi/lib/cmdbuf.xml
+8 -5
View File
@@ -189,11 +189,13 @@
<field name="Buffer" size="36" start="64" type="address" modifier="shr(4)"/>
<!-- N.b. sRGB is not specified here -->
<field name="Level" size="4" start="100" type="uint"/>
<!-- Off by 4? -->
<field name="Stride" size="24" start="104" type="hex" prefix="AGX_RT_STRIDE">
<value name="Tiled" value="0x100000"/>
<value name="Tiled, mipmapped" value="0x100009"/>
</field>
<!-- If layout is not linear -->
<field name="Levels" size="6" start="104" type="uint" modifier="minus(1)"/>
<field name="Unk tiled" size="1" start="124" type="bool"/>
<!-- If layout is linear. Off by 4? -->
<field name="Stride" size="24" start="104" type="hex"/>
<!-- If layout is compressed -->
<field name="Acceleration buffer" size="64" start="128" type="address"/>
@@ -240,6 +242,7 @@
<field name="Stride" size="18" start="110" type="hex" modifier="shr(4)"/>
<!-- Note that 3D/arrays cannot be linear. -->
<field name="Depth" size="14" start="110" type="uint" modifier="minus(1)" default="1"/>
<field name="Unk tiled" size="1" start="126" type="bool"/>
</struct>
<enum name="Wrap">
src/gallium/drivers/asahi/agx_state.c
+7 -6
View File
@@ -491,7 +491,7 @@ agx_create_sampler_view(struct pipe_context *pctx,
cfg.stride = ail_get_linear_stride_B(&rsrc->layout, level) - 16;
} else {
assert(rsrc->modifier == DRM_FORMAT_MOD_APPLE_TWIDDLED);
cfg.stride = AGX_RT_STRIDE_TILED;
cfg.unk_tiled = true;
}
}
@@ -770,8 +770,8 @@ agx_set_framebuffer_state(struct pipe_context *pctx,
if (tex->modifier == DRM_FORMAT_MOD_LINEAR) {
cfg.stride = ail_get_linear_stride_B(&tex->layout, level) - 4;
} else {
cfg.stride = tex->mipmapped ? AGX_RT_STRIDE_TILED_MIPMAPPED :
AGX_RT_STRIDE_TILED;
cfg.unk_tiled = true;
cfg.levels = tex->base.last_level + 1;
}
};
}
@@ -1358,9 +1358,10 @@ agx_build_reload_pipeline(struct agx_context *ctx, uint32_t code, struct pipe_su
cfg.srgb = (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB);
cfg.address = agx_map_texture_gpu(rsrc, level, layer);
cfg.stride = (rsrc->modifier == DRM_FORMAT_MOD_LINEAR) ?
(ail_get_linear_stride_B(&rsrc->layout, level) - 16) :
AGX_RT_STRIDE_TILED;
if (rsrc->modifier == DRM_FORMAT_MOD_LINEAR)
cfg.stride = ail_get_linear_stride_B(&rsrc->layout, level) - 16;
else
cfg.unk_tiled = true;
}
agx_pack(record, BIND_TEXTURE, cfg) {