From b6410a2d227ca71ee26fd3806ec51a2133c5692c Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 25 Oct 2018 02:22:34 -0700 Subject: [PATCH] st/nir: Drop unused parameter from st_nir_assign_uniform_locations(). ARB programs won't have one of these, and we don't use it anyway. Reviewed-by: Rob Clark --- src/mesa/state_tracker/st_glsl_to_nir.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index f609efbff95..dcf8c2b638e 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -240,7 +240,6 @@ st_nir_lookup_parameter_index(const struct gl_program_parameter_list *params, static void st_nir_assign_uniform_locations(struct gl_context *ctx, struct gl_program *prog, - struct gl_shader_program *shader_program, struct exec_list *uniform_list, unsigned *size) { int max = 0; @@ -848,7 +847,7 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog, NIR_PASS_V(nir, nir_lower_atomics_to_ssbo, st->ctx->Const.Program[nir->info.stage].MaxAtomicBuffers); - st_nir_assign_uniform_locations(st->ctx, prog, shader_program, + st_nir_assign_uniform_locations(st->ctx, prog, &nir->uniforms, &nir->num_uniforms); if (st->ctx->Const.PackedDriverUniformStorage) { -- 2.30.2