diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-28 18:31:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-28 18:31:42 +0000 |
| commit | 0c0b98ae72397aeed280ffc146b16eb13065f332 (patch) | |
| tree | 4a34d9ba1cc396e912aa5b473bc0a5bba968d656 /mesalib/src/mesa/shader/slang/slang_link.c | |
| parent | ddf3c86d1414ac4d95e352b195ac30188f024429 (diff) | |
| parent | 022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc (diff) | |
| download | vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.tar.gz vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.tar.bz2 vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/shader/slang/slang_link.c')
| -rw-r--r-- | mesalib/src/mesa/shader/slang/slang_link.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); |