From 2fc4c98aaff49d54187724f0452fce6df23c60bf Mon Sep 17 00:00:00 2001 From: Mel Henning Date: Mon, 21 Apr 2025 16:13:24 -0400 Subject: [PATCH] nvk: Override render enable for blits and resolves Fixes cts tests: dEQP-VK.conditional_rendering.conditional_ignore.blit_image dEQP-VK.conditional_rendering.conditional_ignore.blit_image_inverted dEQP-VK.conditional_rendering.conditional_ignore.resolve_image dEQP-VK.conditional_rendering.conditional_ignore.resolve_image_inverted which were introduced in vk-gl-cts commit 4aa277c300 Fixes: 32f2317223 ("nvk: Use meta for doing blits with the 3D hardware") Part-of: --- src/nouveau/vulkan/nvk_cmd_meta.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_meta.c b/src/nouveau/vulkan/nvk_cmd_meta.c index 165dbd34df3..be60f0068a1 100644 --- a/src/nouveau/vulkan/nvk_cmd_meta.c +++ b/src/nouveau/vulkan/nvk_cmd_meta.c @@ -78,7 +78,10 @@ nvk_meta_begin(struct nvk_cmd_buffer *cmd, { const struct nvk_descriptor_state *desc = &cmd->state.gfx.descriptors; - struct nv_push *p = nvk_cmd_buffer_push(cmd, 2); + struct nv_push *p = nvk_cmd_buffer_push(cmd, 4); + + P_IMMD(p, NV9097, SET_RENDER_ENABLE_OVERRIDE, MODE_ALWAYS_RENDER); + P_IMMD(p, NV9097, SET_STATISTICS_COUNTER, { .da_vertices_generated_enable = false, .da_primitives_generated_enable = false, @@ -204,7 +207,8 @@ nvk_meta_end(struct nvk_cmd_buffer *cmd, nvk_descriptor_state_set_root_array(cmd, desc, push, 0, sizeof(save->push), save->push); - struct nv_push *p = nvk_cmd_buffer_push(cmd, 2); + struct nv_push *p = nvk_cmd_buffer_push(cmd, 4); + P_IMMD(p, NV9097, SET_STATISTICS_COUNTER, { .da_vertices_generated_enable = true, .da_primitives_generated_enable = true, @@ -222,6 +226,8 @@ nvk_meta_end(struct nvk_cmd_buffer *cmd, .total_streaming_primitives_needed_succeeded_enable = true, .vtg_primitives_out_enable = true, }); + + P_IMMD(p, NV9097, SET_RENDER_ENABLE_OVERRIDE, MODE_USE_RENDER_ENABLE); } VKAPI_ATTR void VKAPI_CALL