[Mesa-dev] [PATCH v2 21/21] i965: Link uniforms of SPIR-V programs using the NIR linker

[Timothy Arceri]

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

On 12/05/18 19:40, Alejandro Piñeiro wrote:
> From: Eduardo Lima Mitev <elima at igalia.com>
> 
> v2: nir_link_uniforms renamed to gl_nir_link_uniforms
> 
> Signed-off-by: Eduardo Lima <elima at igalia.com>
> Signed-off-by: Alejandro Piñeiro <apinheiro at igalia.com>
> ---
>   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 c75721c06ca..8bc97fa4f3e 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;
>