From 8dc6c90e11a20325cd509e53cc49e01dce79315f Mon Sep 17 00:00:00 2001 From: coldhex Date: Sat, 8 Mar 2025 00:40:41 +0200 Subject: [PATCH] nv2a/vk: Drop unnecessary dirty check for NV_PGRAPH_ZCOMPRESSOCCLUDE This was used to enable/disable Vulkan depth clamping, but that was removed in previous commit. --- hw/xbox/nv2a/pgraph/vk/draw.c | 16 ++++++---------- hw/xbox/nv2a/pgraph/vk/renderer.h | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/hw/xbox/nv2a/pgraph/vk/draw.c b/hw/xbox/nv2a/pgraph/vk/draw.c index b3c41bc96b..f34b6aa094 100644 --- a/hw/xbox/nv2a/pgraph/vk/draw.c +++ b/hw/xbox/nv2a/pgraph/vk/draw.c @@ -635,11 +635,9 @@ static bool check_pipeline_dirty(PGRAPHState *pg) } const unsigned int regs[] = { - NV_PGRAPH_BLEND, NV_PGRAPH_BLENDCOLOR, - NV_PGRAPH_CONTROL_0, NV_PGRAPH_CONTROL_1, - NV_PGRAPH_CONTROL_2, NV_PGRAPH_CONTROL_3, - NV_PGRAPH_SETUPRASTER, NV_PGRAPH_ZCOMPRESSOCCLUDE, - NV_PGRAPH_ZOFFSETBIAS, NV_PGRAPH_ZOFFSETFACTOR, + NV_PGRAPH_BLEND, NV_PGRAPH_BLENDCOLOR, NV_PGRAPH_CONTROL_0, + NV_PGRAPH_CONTROL_1, NV_PGRAPH_CONTROL_2, NV_PGRAPH_CONTROL_3, + NV_PGRAPH_SETUPRASTER, NV_PGRAPH_ZOFFSETBIAS, NV_PGRAPH_ZOFFSETFACTOR, }; for (int i = 0; i < ARRAY_SIZE(regs); i++) { @@ -682,11 +680,9 @@ static void init_pipeline_key(PGRAPHState *pg, PipelineKey *key) // FIXME: Register masking // FIXME: Use more dynamic state updates const int regs[] = { - NV_PGRAPH_BLEND, NV_PGRAPH_BLENDCOLOR, - NV_PGRAPH_CONTROL_0, NV_PGRAPH_CONTROL_1, - NV_PGRAPH_CONTROL_2, NV_PGRAPH_CONTROL_3, - NV_PGRAPH_SETUPRASTER, NV_PGRAPH_ZCOMPRESSOCCLUDE, - NV_PGRAPH_ZOFFSETBIAS, NV_PGRAPH_ZOFFSETFACTOR, + NV_PGRAPH_BLEND, NV_PGRAPH_BLENDCOLOR, NV_PGRAPH_CONTROL_0, + NV_PGRAPH_CONTROL_1, NV_PGRAPH_CONTROL_2, NV_PGRAPH_CONTROL_3, + NV_PGRAPH_SETUPRASTER, NV_PGRAPH_ZOFFSETBIAS, NV_PGRAPH_ZOFFSETFACTOR, }; assert(ARRAY_SIZE(regs) == ARRAY_SIZE(key->regs)); for (int i = 0; i < ARRAY_SIZE(regs); i++) { diff --git a/hw/xbox/nv2a/pgraph/vk/renderer.h b/hw/xbox/nv2a/pgraph/vk/renderer.h index 1357d707b0..eb0726ac2f 100644 --- a/hw/xbox/nv2a/pgraph/vk/renderer.h +++ b/hw/xbox/nv2a/pgraph/vk/renderer.h @@ -65,7 +65,7 @@ typedef struct PipelineKey { bool clear; RenderPassState render_pass_state; ShaderState shader_state; - uint32_t regs[10]; + uint32_t regs[9]; VkVertexInputBindingDescription binding_descriptions[NV2A_VERTEXSHADER_ATTRIBUTES]; VkVertexInputAttributeDescription attribute_descriptions[NV2A_VERTEXSHADER_ATTRIBUTES]; } PipelineKey;