mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 18:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

nvk: Disable conditional rendering around CopyQueryPoolResults

Browse Source 
Fixes: 57c38a5669 ("nvk: Implement CopyQueryPoolResults with a compute shader")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30826>
(cherry picked from commit cdef36c422)
This commit is contained in:
Faith Ekstrand 2024-08-23 14:58:47 -05:00 committed by Eric Engestrom
parent 2eb470cdc5
commit 7f1f092b23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@ -1394,7 +1394,7 @@
"description": "nvk: Disable conditional rendering around CopyQueryPoolResults",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "57c38a56696cd8a49786a884a9720e63c7ae0161",
"notes": null

6
src/nouveau/vulkan/nvk_query_pool.c
View File

@ -984,8 +984,14 @@ nvk_meta_copy_query_pool_results(struct nvk_cmd_buffer *cmd,
vk_common_CmdPushConstants(nvk_cmd_buffer_to_handle(cmd), layout,
VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(push), &push);
struct nv_push *p = nvk_cmd_buffer_push(cmd, 2);
P_IMMD(p, NVA0C0, SET_RENDER_ENABLE_OVERRIDE, MODE_ALWAYS_RENDER);
nvk_CmdDispatchBase(nvk_cmd_buffer_to_handle(cmd), 0, 0, 0, 1, 1, 1);
p = nvk_cmd_buffer_push(cmd, 2);
P_IMMD(p, NVA0C0, SET_RENDER_ENABLE_OVERRIDE, MODE_USE_RENDER_ENABLE);
/* Restore pipeline and push constants */
if (shader_save)
nvk_cmd_bind_compute_shader(cmd, shader_save);