From 022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 28 Jul 2010 18:15:53 +0000
Subject: Update to mesa 7,8,2

---
 mesalib/src/mesa/shader/slang/slang_link.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'mesalib/src/mesa/shader/slang/slang_link.c')

diff --git a/mesalib/src/mesa/shader/slang/slang_link.c b/mesalib/src/mesa/shader/slang/slang_link.c
index 7c7bfbdbc..e8dca0142 100644
--- a/mesalib/src/mesa/shader/slang/slang_link.c
+++ b/mesalib/src/mesa/shader/slang/slang_link.c
@@ -921,7 +921,10 @@ _slang_link(GLcontext *ctx,
 
    if (!vertNotify || !fragNotify) {
       /* driver rejected one/both of the vertex/fragment programs */
-      link_error(shProg, "Vertex and/or fragment program rejected by driver\n");
+      if (!shProg->InfoLog) {
+	 link_error(shProg,
+		    "Vertex and/or fragment program rejected by driver\n");
+      }
    }
    else {
       shProg->LinkStatus = (shProg->VertexProgram || shProg->FragmentProgram);
-- 
cgit v1.2.3