summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-04-29 13:35:37 -0700
committerEric Anholt <eric@anholt.net>2010-04-29 13:37:27 -0700
commit07a248a3664e4cd63c98ff3478bdd9b1e45c1398 (patch)
treee039920b159144ccfd549cc1863f8834337278b3 /src/mesa
parentf7cf8b4658aadb0a125f1e1fb9d6cb73d44902b0 (diff)
mesa: Don't overwrite a driver's shader infolog with generic failure message.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/shader/slang/slang_link.c5
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 f71fde1d727..47bc9339716 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -1028,7 +1028,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);