From e83f0fc6202292c6215cb7c57cae6c9a1d0b64e2 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 7 Jan 2022 10:33:06 +1000 Subject: [PATCH] glsl: don't pass gl_context to lower shared references. this uses the consts only Reviewed-by: Timothy Arceri Part-of: --- src/compiler/glsl/ir_optimization.h | 2 +- src/compiler/glsl/linker.cpp | 2 +- src/compiler/glsl/lower_shared_reference.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/glsl/ir_optimization.h b/src/compiler/glsl/ir_optimization.h index 898e2f7e455..934865ad6b6 100644 --- a/src/compiler/glsl/ir_optimization.h +++ b/src/compiler/glsl/ir_optimization.h @@ -142,7 +142,7 @@ ir_variable * lower_xfb_varying(void *mem_ctx, const char *old_var_name); void lower_output_reads(unsigned stage, exec_list *instructions); bool lower_packing_builtins(exec_list *instructions, int op_mask); -void lower_shared_reference(struct gl_context *ctx, +void lower_shared_reference(const struct gl_constants *consts, struct gl_shader_program *prog, struct gl_linked_shader *shader); void lower_ubo_reference(struct gl_linked_shader *shader, diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 6d322e86955..4c639f02c0c 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -4581,7 +4581,7 @@ link_varyings_and_uniforms(unsigned first, unsigned last, ctx->Const.UseSTD430AsDefaultPacking); if (i == MESA_SHADER_COMPUTE) - lower_shared_reference(ctx, prog, prog->_LinkedShaders[i]); + lower_shared_reference(&ctx->Const, prog, prog->_LinkedShaders[i]); lower_vector_derefs(prog->_LinkedShaders[i]); do_vec_index_to_swizzle(prog->_LinkedShaders[i]->ir); diff --git a/src/compiler/glsl/lower_shared_reference.cpp b/src/compiler/glsl/lower_shared_reference.cpp index 6667db3d5ef..8e40beb2121 100644 --- a/src/compiler/glsl/lower_shared_reference.cpp +++ b/src/compiler/glsl/lower_shared_reference.cpp @@ -482,7 +482,7 @@ lower_shared_reference_visitor::visit_enter(ir_call *ir) } /* unnamed namespace */ void -lower_shared_reference(struct gl_context *ctx, +lower_shared_reference(const struct gl_constants *consts, struct gl_shader_program *prog, struct gl_linked_shader *shader) { @@ -511,9 +511,9 @@ lower_shared_reference(struct gl_context *ctx, * basic machine units, may be queried as the value of * MAX_COMPUTE_SHARED_MEMORY_SIZE." */ - if (prog->Comp.SharedSize > ctx->Const.MaxComputeSharedMemorySize) { + if (prog->Comp.SharedSize > consts->MaxComputeSharedMemorySize) { linker_error(prog, "Too much shared memory used (%u/%u)\n", prog->Comp.SharedSize, - ctx->Const.MaxComputeSharedMemorySize); + consts->MaxComputeSharedMemorySize); } }