Module: Mesa Branch: master Commit: 77e790f99a5c6ee7b9687149b944ca4fb4a8ff9b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=77e790f99a5c6ee7b9687149b944ca4fb4a8ff9b
Author: Eduardo Lima Mitev <[email protected]> Date: Tue Nov 14 17:44:39 2017 +0100 i965: Link uniforms of SPIR-V programs using the NIR linker v2: nir_link_uniforms renamed to gl_nir_link_uniforms Signed-off-by: Eduardo Lima <[email protected]> Signed-off-by: Alejandro Piñeiro <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> --- src/mesa/drivers/dri/i965/brw_link.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index c75721c06c..8bc97fa4f3 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -261,6 +261,12 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) compiler->scalar_stage[stage]); } + /* SPIR-V programs use a NIR linker */ + if (shProg->data->spirv) { + if (!gl_nir_link_uniforms(ctx, shProg)) + return false; + } + /* Determine first and last stage. */ unsigned first = MESA_SHADER_STAGES; unsigned last = 0; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
