From: Jordan Justen <jordan.l.justen@intel.com>
Date: Tue, 12 Dec 2017 19:44:01 +0000 (-0800)
Subject: program: Don't reset SamplersValidated when restoring from shader cache
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dc07bb5fd188a4352ec90edb6c6107ae1ce11b50;p=mesa.git

program: Don't reset SamplersValidated when restoring from shader cache

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103988
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 5f663b3d09f..29198509a6c 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -3115,15 +3115,17 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
       link_shaders(ctx, prog);
    }
 
-   if (prog->data->LinkStatus) {
-      /* Reset sampler validated to true, validation happens via the
-       * LinkShader call below.
-       */
+   /* If LinkStatus is linking_success, then reset sampler validated to true.
+    * Validation happens via the LinkShader call below. If LinkStatus is
+    * linking_skipped, then SamplersValidated will have been restored from the
+    * shader cache.
+    */
+   if (prog->data->LinkStatus == linking_success) {
       prog->SamplersValidated = GL_TRUE;
+   }
 
-      if (!ctx->Driver.LinkShader(ctx, prog)) {
-         prog->data->LinkStatus = linking_failure;
-      }
+   if (prog->data->LinkStatus && !ctx->Driver.LinkShader(ctx, prog)) {
+      prog->data->LinkStatus = linking_failure;
    }
 
    /* Return early if we are loading the shader from on-disk cache */