diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 8857350f448..2fdd05b0cc4 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2641,24 +2641,6 @@ _mesa_use_program(struct gl_context *ctx, gl_shader_stage stage, } -/** - * Copy program-specific data generated by linking from the gl_shader_program - * object to the gl_program object referred to by the gl_linked_shader. - * - * This function expects _mesa_reference_program() to have been previously - * called setting the gl_linked_shaders program reference. - */ -void -_mesa_copy_linked_program_data(const struct gl_shader_program *src, - struct gl_linked_shader *dst_sh) -{ - assert(dst_sh->Program); - - struct gl_program *dst = dst_sh->Program; - - dst->info.separate_shader = src->SeparateShader; -} - /** * ARB_separate_shader_objects: Compile & Link Program */ diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 35177d42f64..d46a3d688ba 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -88,10 +88,6 @@ _mesa_use_program(struct gl_context *ctx, gl_shader_stage stage, struct gl_shader_program *shProg, struct gl_program *prog, struct gl_pipeline_object *shTarget); -extern void -_mesa_copy_linked_program_data(const struct gl_shader_program *src, - struct gl_linked_shader *dst_sh); - extern bool _mesa_validate_shader_target(const struct gl_context *ctx, GLenum type); diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 70f6df8787d..a341b3a7723 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -520,7 +520,7 @@ st_link_glsl_to_nir(struct gl_context *ctx, st->ctx->Const.ShaderCompilerOptions[shader->Stage].NirOptions; struct gl_program *prog = shader->Program; - _mesa_copy_linked_program_data(shader_program, shader); + shader->Program->info.separate_shader = shader_program->SeparateShader; assert(!prog->nir); prog->shader_program = shader_program;