diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2009-06-09 07:53:25 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-06-09 07:53:25 +0200 |
| commit | ee98ae5a29ca870149c4a0d2a8f25f55e0fd333a (patch) | |
| tree | 308fa87e22a276c0f8f28fd9f0986d20b52be928 /src/mesa/shader/arbprogparse.c | |
| parent | d9617deb008b75f4a605a30408aeb1948139c33e (diff) | |
| parent | 76a1017e978f8e51114d765c8c98ff25da13042b (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
src/mesa/shader/slang/slang_preprocess.c
src/mesa/state_tracker/st_cb_bufferobjects.c
Diffstat (limited to 'src/mesa/shader/arbprogparse.c')
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index a90ce95a63..7e166830fd 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -1022,7 +1022,10 @@ parse_teximage_num (GLcontext * ctx, const GLubyte ** inst, GLint i = parse_integer (inst, Program); if ((i < 0) || (i >= (int)ctx->Const.MaxTextureImageUnits)) { - program_error(ctx, Program->Position, "Invalid texture image index"); + char s[100]; + _mesa_snprintf(s, sizeof(s), "Invalid texture image index %d (%u is max)", + i, ctx->Const.MaxTextureImageUnits); + program_error(ctx, Program->Position, s); return 1; } |