From 1dbfc3e21ab39189d5de0e16b5be691eca07b6f8 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Sat, 28 Jun 2025 15:20:11 -0700 Subject: [PATCH] nv2a/glsl: Fix duplicate inlineValue uniform declaration --- hw/xbox/nv2a/pgraph/glsl/vsh.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/hw/xbox/nv2a/pgraph/glsl/vsh.c b/hw/xbox/nv2a/pgraph/glsl/vsh.c index 56ed85818a..885ac6ef75 100644 --- a/hw/xbox/nv2a/pgraph/glsl/vsh.c +++ b/hw/xbox/nv2a/pgraph/glsl/vsh.c @@ -432,16 +432,13 @@ MString *pgraph_glsl_gen_vsh(const VshState *state, GenVshGlslOptions opts) if (opts.vulkan) { // FIXME: Optimize uniforms - if (num_uniform_attrs > 0) { - if (opts.use_push_constants_for_uniform_attrs) { - mstring_append_fmt(output, - "layout(push_constant) uniform PushConstants {\n" - " vec4 inlineValue[%d];\n" - "};\n\n", num_uniform_attrs); - } else { - mstring_append_fmt(uniforms, " vec4 inlineValue[%d];\n", - NV2A_VERTEXSHADER_ATTRIBUTES); - } + if (num_uniform_attrs > 0 && + opts.use_push_constants_for_uniform_attrs) { + mstring_append_fmt(output, + "layout(push_constant) uniform PushConstants {\n" + " vec4 inlineValue[%d];\n" + "};\n\n", + num_uniform_attrs); } mstring_append_fmt( output,