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

panvk/csf: Fix dirty checking in prepare_ds()

Browse Source 
If the fragment shader changed, we need to re-emit the depth-stencil
descriptor.

Fixes: 5544d39f44 ("panvk: Add a CSF backend for panvk_queue/cmd_buffer")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31625>
This commit is contained in:
Boris Brezillon
2024-10-04 14:20:11 +02:00
committed by Marge Bot
parent 1096adb128
commit 4199212ebe
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
+4 -2
View File
@@ -1039,6 +1039,8 @@ prepare_push_uniforms(struct panvk_cmd_buffer *cmdbuf)
static VkResult
prepare_ds(struct panvk_cmd_buffer *cmdbuf)
{
const struct panvk_shader *fs = cmdbuf->state.gfx.fs.shader;
mali_ptr frag_spd = fs ? panvk_priv_mem_dev_addr(fs->spd) : 0;
bool dirty = is_dirty(cmdbuf, DS_DEPTH_TEST_ENABLE) ||
is_dirty(cmdbuf, DS_DEPTH_WRITE_ENABLE) ||
is_dirty(cmdbuf, DS_DEPTH_COMPARE_OP) ||
@@ -1057,14 +1059,14 @@ prepare_ds(struct panvk_cmd_buffer *cmdbuf)
is_dirty(cmdbuf, MS_ALPHA_TO_COVERAGE_ENABLE) ||
is_dirty(cmdbuf, CB_ATTACHMENT_COUNT) ||
is_dirty(cmdbuf, CB_COLOR_WRITE_ENABLES) ||
is_dirty(cmdbuf, CB_WRITE_MASKS);
is_dirty(cmdbuf, CB_WRITE_MASKS) ||
cmdbuf->state.gfx.fs.spd != frag_spd;
if (!dirty)
return VK_SUCCESS;
struct cs_builder *b =
panvk_get_cs_builder(cmdbuf, PANVK_SUBQUEUE_VERTEX_TILER);
const struct panvk_shader *fs = cmdbuf->state.gfx.fs.shader;
const struct vk_dynamic_graphics_state *dyns =
&cmdbuf->vk.dynamic_graphics_state;
const struct vk_depth_stencil_state *ds = &dyns->ds;