diff options
author | Eric Anholt <eric@anholt.net> | 2010-04-29 13:35:37 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-05-13 11:40:17 -0700 |
commit | 3bf7ea2a1ce0df9a4fb92600d5080b16af5d1a62 (patch) | |
tree | 78f9c5c2a1d622f8ec50c3954d23ba9cd686ca4c | |
parent | f3b55494f33e8c6569f8a1ca7dacc9e0f0dd1228 (diff) |
mesa: Don't overwrite a driver's shader infolog with generic failure message.
(cherry picked from commit 07a248a3664e4cd63c98ff3478bdd9b1e45c1398)
-rw-r--r-- | 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 7c7bfbdbc5..e8dca01426 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); |