[Mesa-dev] [PATCH 08/11] mesa/program: Link SPIR-V shaders using the SPIR-V code-path

[Timothy Arceri]

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>


On 08/03/18 19:19, Alejandro Piñeiro wrote:
> From: Eduardo Lima Mitev <elima at igalia.com>
>
> ---
>   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 74089605029..4d45b0a4cd5 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"
> @@ -3111,7 +3112,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.