Skip to content

Commit 223a1b1

Browse files
committed
nv2a/vk: Fix point param uniform setup
1 parent ab4235d commit 223a1b1

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

hw/xbox/nv2a/pgraph/vk/renderer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,9 @@ typedef struct ShaderBinding {
191191
int light_local_position_loc[NV2A_MAX_LIGHTS];
192192
int light_local_attenuation_loc[NV2A_MAX_LIGHTS];
193193
int specular_power_loc;
194+
int point_params_loc;
194195

195196
int clip_region_loc;
196-
197-
int point_params_loc[8];
198197
int material_alpha_loc;
199198

200199
int uniform_attrs_loc;

hw/xbox/nv2a/pgraph/vk/shaders.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,8 @@ static void update_shader_constant_locations(ShaderBinding *binding)
308308
binding->clip_region_loc =
309309
uniform_index(&binding->fragment->uniforms, "clipRegion");
310310

311-
for (int i = 0; i < 8; ++i) {
312-
snprintf(tmp, sizeof(tmp), "pointParams[%d]", i);
313-
binding->point_params_loc[i] =
314-
uniform_index(&binding->vertex->uniforms, tmp);
315-
}
311+
binding->point_params_loc =
312+
uniform_index(&binding->vertex->uniforms, "pointParams");
316313

317314
binding->material_alpha_loc =
318315
uniform_index(&binding->vertex->uniforms, "material_alpha");
@@ -726,11 +723,9 @@ static void shader_update_constants(PGRAPHState *pg, ShaderBinding *binding,
726723
uniform1iv(&binding->fragment->uniforms, binding->clip_region_loc,
727724
8 * 4, (void *)clip_regions);
728725

729-
for (int i = 0; i < 8; ++i) {
730-
int loc = binding->point_params_loc[i];
731-
if (loc != -1) {
732-
uniform1f(&binding->vertex->uniforms, loc, pg->point_params[i]);
733-
}
726+
if (binding->point_params_loc != -1) {
727+
uniform1iv(&binding->vertex->uniforms, binding->point_params_loc,
728+
ARRAY_SIZE(pg->point_params), (void *)pg->point_params);
734729
}
735730

736731
if (binding->material_alpha_loc != -1) {

0 commit comments

Comments
 (0)