fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Enable ZPASS_PIXEL_COUNT in draw_state_init()

Browse source 
Fixes: 052bbd65c9 ("nvk: Implement pipeline statistics and occlusion queries")
Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
(cherry picked from commit c081ab864f)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39745>
This commit is contained in:
Faith Ekstrand 2024-02-27 18:52:59 -06:00 • committed by Dylan Baker
parent a808fd5078
commit 16c564b973
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1404,7 +1404,7 @@
"description": "nvk: Enable ZPASS_PIXEL_COUNT in draw_state_init()",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "052bbd65c9a48b2dba363058c7c289f24a1ad265",
"notes": null

3
src/nouveau/vulkan/nvk_cmd_draw.c
View file

@ -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 });

4
src/nouveau/vulkan/nvk_query_pool.c
View file

@ -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);