projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7cf8b4
)
mesa: Don't overwrite a driver's shader infolog with generic failure message.
author
Eric Anholt
<eric@anholt.net>
Thu, 29 Apr 2010 20:35:37 +0000
(13:35 -0700)
committer
Eric Anholt
<eric@anholt.net>
Thu, 29 Apr 2010 20:37:27 +0000
(13:37 -0700)
src/mesa/shader/slang/slang_link.c
patch
|
blob
|
history
diff --git
a/src/mesa/shader/slang/slang_link.c
b/src/mesa/shader/slang/slang_link.c
index f71fde1d7271741081bd367f27e0caf0c55513b8..47bc93397163f06cf49cb6b8d2e1fc68bfbe13b3 100644
(file)
--- 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);