projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
681ff41
)
mesa: better error message when running out of GLSL samplers
author
Brian Paul
<brianp@vmware.com>
Wed, 31 Dec 2008 00:03:09 +0000
(17:03 -0700)
committer
Brian Paul
<brianp@vmware.com>
Tue, 6 Jan 2009 16:17:53 +0000
(09:17 -0700)
(cherry picked from commit
ca0540e25c86b8095511868b0cbe96d7e85f7437
)
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 834f05176c43ca2d56e5eab23df2dde2155fed95..22ae635b06561049e3fbcfe1baf7dfa49f0318b9 100644
(file)
--- a/
src/mesa/shader/slang/slang_link.c
+++ b/
src/mesa/shader/slang/slang_link.c
@@
-240,7
+240,10
@@
link_uniform_vars(struct gl_shader_program *shProg,
GLuint sampNum = *numSamplers;
GLuint oldSampNum = (GLuint) prog->Parameters->ParameterValues[i][0];
if (oldSampNum >= MAX_SAMPLERS) {
- link_error(shProg, "Too many texture samplers");
+ char s[100];
+ sprintf(s, "Too many texture samplers (%u, max is %u)",
+ oldSampNum + 1, MAX_SAMPLERS);
+ link_error(shProg, s);
return GL_FALSE;
}
samplerMap[oldSampNum] = sampNum;