fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-15 08:30:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Ignore meta ops in occlusion queries

Browse source 
Fixes: 052bbd65c9 ("nvk: Implement pipeline statistics and occlusion queries")
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39510>
(cherry picked from commit e32bfc5efe)
This commit is contained in:
Mel Henning 2026-01-24 13:13:01 -05:00 • committed by Eric Engestrom
parent e8f33e8ffb
commit 03c90bcd1f
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1874,7 +1874,7 @@
"description": "nvk: Ignore meta ops in occlusion queries",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "052bbd65c9a48b2dba363058c7c289f24a1ad265",
"notes": null

8
src/nouveau/vulkan/nvk_cmd_meta.c
View file

@ -78,7 +78,7 @@ 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, 4);
struct nv_push *p = nvk_cmd_buffer_push(cmd, 6);
P_IMMD(p, NV9097, SET_RENDER_ENABLE_OVERRIDE, MODE_ALWAYS_RENDER);
@ -100,6 +100,8 @@ nvk_meta_begin(struct nvk_cmd_buffer *cmd,
.vtg_primitives_out_enable = false,
});
P_IMMD(p, NV9097, SET_ZPASS_PIXEL_COUNT, false);
save->dynamic = cmd->vk.dynamic_graphics_state;
save->_dynamic_vi = cmd->state.gfx._dynamic_vi;
save->_dynamic_sl = cmd->state.gfx._dynamic_sl;
@ -187,7 +189,9 @@ 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, 4);
struct nv_push *p = nvk_cmd_buffer_push(cmd, 6);
P_IMMD(p, NV9097, SET_ZPASS_PIXEL_COUNT, true);
P_IMMD(p, NV9097, SET_STATISTICS_COUNTER, {
.da_vertices_generated_enable = true,