mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

glsl: inline _mesa_copy_linked_program_data() 

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28709>
This commit is contained in:
Timothy Arceri 2024-04-12 15:12:38 +10:00 committed by Marge Bot
parent 4655381e3b
commit 1984712a8e
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/main/shaderapi.c
View File

@ -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
*/

4
src/mesa/main/shaderapi.h
View File

@ -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);

2
src/mesa/state_tracker/st_glsl_to_nir.cpp
View File

@ -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;