diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp index 44f7eaf7d4f..29bf1b327ff 100644 --- a/src/glsl/link_uniform_initializers.cpp +++ b/src/glsl/link_uniform_initializers.cpp @@ -83,8 +83,7 @@ copy_constant_to_storage(union gl_constant_value *storage, } void -set_sampler_binding(void *mem_ctx, gl_shader_program *prog, - const char *name, const glsl_type *type, int binding) +set_sampler_binding(gl_shader_program *prog, const char *name, int binding) { struct gl_uniform_storage *const storage = get_storage(prog->UniformStorage, prog->NumUserUniformStorage, name); @@ -123,8 +122,7 @@ set_sampler_binding(void *mem_ctx, gl_shader_program *prog, } void -set_block_binding(void *mem_ctx, gl_shader_program *prog, - const char *name, const glsl_type *type, int binding) +set_block_binding(gl_shader_program *prog, const char *name, int binding) { struct gl_uniform_storage *const storage = get_storage(prog->UniformStorage, prog->NumUserUniformStorage, name); @@ -252,11 +250,9 @@ link_set_uniform_initializers(struct gl_shader_program *prog) if (type->is_sampler() || (type->is_array() && type->fields.array->is_sampler())) { - linker::set_sampler_binding(mem_ctx, prog, var->name, - type, var->data.binding); + linker::set_sampler_binding(prog, var->name, var->data.binding); } else if (var->is_in_uniform_block()) { - linker::set_block_binding(mem_ctx, prog, var->name, - type, var->data.binding); + linker::set_block_binding(prog, var->name, var->data.binding); } else if (type->contains_atomic()) { /* we don't actually need to do anything. */ } else {