From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 8 Oct 2010 00:20:15 +0000 (-0700)
Subject: glsl: Fail linking if assign_attribute_locations fails
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b5489dd6f6d21c9d2e3f3d6d6467dcd429264a2;p=mesa.git

glsl: Fail linking if assign_attribute_locations fails
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 4bb4e2a9945..bddf8788b47 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -1486,8 +1486,10 @@ link_shaders(GLcontext *ctx, struct gl_shader_program *prog)
        * FINISHME: GL_MAX_VERTEX_ATTRIBS.  GL_MAX_VERTEX_ATTRIBS must be
        * FINISHME: at least 16, so hardcode 16 for now.
        */
-      if (!assign_attribute_locations(prog, 16))
+      if (!assign_attribute_locations(prog, 16)) {
+	 prog->LinkStatus = false;
 	 goto done;
+      }
 
       if (prog->_NumLinkedShaders == 1)
 	 demote_unread_shader_outputs(prog->_LinkedShaders[0]);