diff options
| author | Eduardo Lima Mitev <[email protected]> | 2017-10-10 14:01:45 +0200 |
|---|---|---|
| committer | Alejandro Piñeiro <[email protected]> | 2018-03-30 09:14:56 +0200 |
| commit | 16f6634e7fb5ada308e55b852cd49251e7f3f8b1 (patch) | |
| tree | 23a49785c514f2a674d48d21025be7b9ca019168 | |
| parent | 9c36e9f8626fb2b02736abbd11e783b61a40959c (diff) | |
mesa/program: Link SPIR-V shaders using the SPIR-V code-path
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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. |