Module: Mesa Branch: master Commit: a940683733f5f5d22453237840e970dd7ca81a5d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a940683733f5f5d22453237840e970dd7ca81a5d
Author: Eduardo Lima Mitev <[email protected]> Date: Tue Oct 10 10:27:01 2017 +0200 mesa/main: Add a 'spirv' flag to gl_shader_program_data This will be used by the linker code to differentiate between programs made out of SPIR-V or GLSL shaders. This was rejected in the past, assuming that it was equivalent to check for "shProg->_LinkedShaders[stage]->spirv_data != NULL". But: * At some points of the linking process it would be needed to check if _LinkerShaders[stage] is present, so the full check would be: "shProg->_LinkedShaders[stage] != NULL && shProg->_LinkedShaders[stage]->spirv_data != NULL" * Sometimes you would like to do some specific to SPIR-V independently of the stage, or for any stage. For example, "link all the uniforms, for all stages". In that case checking for the flag would be equivalent to iterate all the _LinkedShaders and check if there is any spirv_data available. The former makes readibility really worse. Both could be solved by adding two helpers. But adding a flag seems really more simple and readable. v2: added justification for the flag on the commit message (Alejandro) Signed-off-by: Eduardo Lima <[email protected]> Signed-off-by: Alejandro PiƱeiro <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> --- src/mesa/main/mtypes.h | 6 ++++++ src/mesa/program/ir_to_mesa.cpp | 1 + 2 files changed, 7 insertions(+) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 19c673eb1d..0dfff31396 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2893,6 +2893,12 @@ struct gl_shader_program_data /* Mask of stages this program was linked against */ unsigned linked_stages; + + /* Whether the shaders of this program are loaded from SPIR-V binaries + * (all have the SPIR_V_BINARY_ARB state). This was introduced by the + * ARB_gl_spirv extension. + */ + bool spirv; }; /** diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 60fb24bf66..2908819d28 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3153,6 +3153,7 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) "SPIR_V_BINARY_ARB state"); } } + prog->data->spirv = spirv; if (prog->data->LinkStatus) { if (!spirv) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
