fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: nir_build_program_resource_list support mesh shader

Browse source 
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36405>
This commit is contained in:
Qiang Yu 2025-08-11 15:58:04 +08:00 • committed by Marge Bot
parent 30fde159eb
commit 5b87ef9560
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/compiler/glsl/gl_nir_linker.c
View file

@ -977,6 +977,29 @@ init_program_resource_list(struct gl_shader_program *prog)
}
}
static void
find_first_and_last_stage(const struct gl_shader_program *prog,
unsigned *first, unsigned *last)
{
static const mesa_shader_stage index_to_stage[] = {
MESA_SHADER_TASK, MESA_SHADER_MESH, MESA_SHADER_VERTEX,
MESA_SHADER_TESS_CTRL, MESA_SHADER_TESS_EVAL, MESA_SHADER_GEOMETRY,
MESA_SHADER_FRAGMENT, MESA_SHADER_COMPUTE
};
*first = MESA_SHADER_MESH_STAGES;
*last = 0;
for (unsigned i = 0; i < ARRAY_SIZE(index_to_stage); i++) {
mesa_shader_stage stage = index_to_stage[i];
if (!prog->_LinkedShaders[stage])
continue;
if (*first == MESA_SHADER_MESH_STAGES)
*first = stage;
*last = stage;
}
}
void
nir_build_program_resource_list(const struct gl_constants *consts,
struct gl_shader_program *prog,
@ -986,19 +1009,12 @@ nir_build_program_resource_list(const struct gl_constants *consts,
if (rebuild_resourse_list)
init_program_resource_list(prog);
int input_stage = MESA_SHADER_MESH_STAGES, output_stage = 0;
/* Determine first input and final output stage. These are used to
* detect which variables should be enumerated in the resource list
* for GL_PROGRAM_INPUT and GL_PROGRAM_OUTPUT.
*/
for (unsigned i = 0; i < MESA_SHADER_MESH_STAGES; i++) {
if (!prog->_LinkedShaders[i])
continue;
if (input_stage == MESA_SHADER_MESH_STAGES)
input_stage = i;
output_stage = i;
}
unsigned input_stage, output_stage;
find_first_and_last_stage(prog, &input_stage, &output_stage);
/* Empty shader, no resources. */
if (input_stage == MESA_SHADER_MESH_STAGES && output_stage == 0)