From c081ab864f4e57ee897cdc7444f21571dbd042b7 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 27 Feb 2024 18:52:59 -0600 Subject: [PATCH] nvk: Enable ZPASS_PIXEL_COUNT in draw_state_init() Fixes: 052bbd65c9a ("nvk: Implement pipeline statistics and occlusion queries") Reviewed-by: Mel Henning Part-of: --- src/nouveau/vulkan/nvk_cmd_draw.c | 3 +++ src/nouveau/vulkan/nvk_query_pool.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index af3b7699ee9..1f6897a7001 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -385,6 +385,9 @@ nvk_push_draw_state_init(struct nvk_queue *queue, struct nv_push *p) .output7 = OUTPUT7_FALSE, }); + /* The blob driver just always leaves this on. */ + P_IMMD(p, NV9097, SET_ZPASS_PIXEL_COUNT, ENABLE_TRUE); + P_IMMD(p, NV9097, SET_POINT_SIZE, fui(1.0)); P_IMMD(p, NV9097, SET_ATTRIBUTE_POINT_SIZE, { .enable = ENABLE_TRUE }); diff --git a/src/nouveau/vulkan/nvk_query_pool.c b/src/nouveau/vulkan/nvk_query_pool.c index a3d43503fd6..7082d95dc96 100644 --- a/src/nouveau/vulkan/nvk_query_pool.c +++ b/src/nouveau/vulkan/nvk_query_pool.c @@ -469,9 +469,7 @@ nvk_cmd_begin_end_query(struct nvk_cmd_buffer *cmd, struct nv_push *p; switch (pool->vk.query_type) { case VK_QUERY_TYPE_OCCLUSION: - p = nvk_cmd_buffer_push(cmd, 7 + end_size); - - P_IMMD(p, NV9097, SET_ZPASS_PIXEL_COUNT, !end); + p = nvk_cmd_buffer_push(cmd, 5 + end_size); P_MTHD(p, NV9097, SET_REPORT_SEMAPHORE_A); P_NV9097_SET_REPORT_SEMAPHORE_A(p, report_addr >> 32);