From 16f6634e7fb5ada308e55b852cd49251e7f3f8b1 Mon Sep 17 00:00:00 2001 From: Eduardo Lima Mitev Date: Tue, 10 Oct 2017 14:01:45 +0200 Subject: [PATCH] mesa/program: Link SPIR-V shaders using the SPIR-V code-path Reviewed-by: Timothy Arceri --- src/mesa/program/ir_to_mesa.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index b0b322865b7..49ef5ea52d8 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -35,6 +35,7 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" +#include "main/glspirv.h" #include "compiler/glsl/ast.h" #include "compiler/glsl/ir.h" #include "compiler/glsl/ir_expression_flattening.h" @@ -3154,7 +3155,10 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) } if (prog->data->LinkStatus) { - link_shaders(ctx, prog); + if (!spirv) + link_shaders(ctx, prog); + else + _mesa_spirv_link_shaders(ctx, prog); } /* If LinkStatus is LINKING_SUCCESS, then reset sampler validated to true. -- 2.30.2