diff --git a/.pick_status.json b/.pick_status.json index 844076c11d1..2adaf4993b5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -504,7 +504,7 @@ "description": "nvk: Override render enable for blits and resolves", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "32f2317223c4e5dfc085bd1c0f506bd0831e7fb2", "notes": null 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