Mesa (7.8): mesa: Don't overwrite a driver' s shader infolog with generic failure message.

Eric Anholt anholt at kemper.freedesktop.org
Thu May 13 14:12:52 PDT 2010


Module: Mesa
Branch: 7.8
Commit: 3bf7ea2a1ce0df9a4fb92600d5080b16af5d1a62
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bf7ea2a1ce0df9a4fb92600d5080b16af5d1a62

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Apr 29 13:35:37 2010 -0700

mesa: Don't overwrite a driver's shader infolog with generic failure message.
(cherry picked from commit 07a248a3664e4cd63c98ff3478bdd9b1e45c1398)

---

 src/mesa/shader/slang/slang_link.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 7c7bfbd..e8dca01 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/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);



More information about the mesa-commit mailing list