From d2677cb6d78939d1a51e6d51df48bae606f10785 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Mon, 6 Jun 2022 12:43:50 -0700
Subject: [PATCH] mesa/st: Abort the linking on driver link failure.

If the driver said it can't do the shader, then listen to it and don't ask
it to create the shaders anyway.  Fixes a bunch of spam on i915/r300 (with
!16878) about unsupported opcodes during dEQP runs.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16895>
---
 src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 77663849023..27ff0e349cf 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -851,7 +851,7 @@ st_link_nir(struct gl_context *ctx,
       char *msg = st_glsl_to_nir_post_opts(st, shader->Program, shader_program);
       if (msg) {
          linker_error(shader_program, msg);
-         break;
+         return false;
       }
 
       if (prev_info &&