summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-12-30 17:03:09 -0700
committerBrian Paul <[email protected]>2009-01-06 09:17:53 -0700
commitefe91b0000d162deb20486ef6d5e016a11428499 (patch)
tree529b75f29f0131357fe3e216c1555d3fbae21b8c /src/mesa
parent681ff412f9828684bda8d156181f06360752c72d (diff)
mesa: better error message when running out of GLSL samplers
(cherry picked from commit ca0540e25c86b8095511868b0cbe96d7e85f7437)
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 834f05176c4..22ae635b065 100644
--- 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;