diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index fe2c44733b7..ead2f589c1c 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -2521,7 +2521,7 @@ link_intrastage_shaders(void *mem_ctx, return NULL; } - _mesa_reference_shader_program_data(ctx, &gl_prog->sh.data, prog->data); + _mesa_reference_shader_program_data(&gl_prog->sh.data, prog->data); /* Don't use _mesa_reference_program() just take ownership */ linked->Program = gl_prog; diff --git a/src/compiler/glsl/serialize.cpp b/src/compiler/glsl/serialize.cpp index dbc0ab7c11b..64b11cedc90 100644 --- a/src/compiler/glsl/serialize.cpp +++ b/src/compiler/glsl/serialize.cpp @@ -1244,7 +1244,7 @@ create_linked_shader_and_program(struct gl_context *ctx, blob_copy_bytes(metadata, ((uint8_t *) &glprog->info) + s_info_ptrs, s_info_size - s_info_ptrs); - _mesa_reference_shader_program_data(ctx, &glprog->sh.data, prog->data); + _mesa_reference_shader_program_data(&glprog->sh.data, prog->data); _mesa_reference_program(ctx, &linked->Program, glprog); prog->_LinkedShaders[stage] = linked; } diff --git a/src/mesa/main/glspirv.c b/src/mesa/main/glspirv.c index a90c5e1624a..3eeff7022de 100644 --- a/src/mesa/main/glspirv.c +++ b/src/mesa/main/glspirv.c @@ -158,8 +158,7 @@ _mesa_spirv_link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) return; } - _mesa_reference_shader_program_data(ctx, - &gl_prog->sh.data, + _mesa_reference_shader_program_data(&gl_prog->sh.data, prog->data); /* Don't use _mesa_reference_program() just take ownership */ diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 2f5c2da15f5..0d163290b00 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -205,8 +205,7 @@ _mesa_lookup_shader_err(struct gl_context *ctx, GLuint name, const char *caller) /**********************************************************************/ void -_mesa_reference_shader_program_data(struct gl_context *ctx, - struct gl_shader_program_data **ptr, +_mesa_reference_shader_program_data(struct gl_shader_program_data **ptr, struct gl_shader_program_data *data) { if (*ptr == data) @@ -218,7 +217,6 @@ _mesa_reference_shader_program_data(struct gl_context *ctx, assert(oldData->RefCount > 0); if (p_atomic_dec_zero(&oldData->RefCount)) { - assert(ctx); assert(oldData->NumUniformStorage == 0 || oldData->UniformStorage); @@ -357,7 +355,7 @@ _mesa_clear_shader_program_data(struct gl_context *ctx, if (shProg->data) _mesa_program_resource_hash_destroy(shProg); - _mesa_reference_shader_program_data(ctx, &shProg->data, NULL); + _mesa_reference_shader_program_data(&shProg->data, NULL); } diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h index e0a434409b8..c94e20ce370 100644 --- a/src/mesa/main/shaderobj.h +++ b/src/mesa/main/shaderobj.h @@ -71,8 +71,7 @@ _mesa_reference_shader_program_(struct gl_context *ctx, struct gl_shader_program *shProg); void -_mesa_reference_shader_program_data(struct gl_context *ctx, - struct gl_shader_program_data **ptr, +_mesa_reference_shader_program_data(struct gl_shader_program_data **ptr, struct gl_shader_program_data *data); static inline void diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 73ed8848459..2124f1bff61 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -301,7 +301,7 @@ _mesa_reference_program_(struct gl_context *ctx, if (p_atomic_dec_zero(&oldProg->RefCount)) { assert(ctx); - _mesa_reference_shader_program_data(ctx, &oldProg->sh.data, NULL); + _mesa_reference_shader_program_data(&oldProg->sh.data, NULL); st_delete_program(ctx, oldProg); }