summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanley Chery <nanley.g.chery@intel.com>2015-08-07 16:37:47 -0700
committerNanley Chery <nanley.g.chery@intel.com>2015-08-12 13:48:45 -0700
commit91698d1206b86ef1710291213145275a2dd06dd7 (patch)
treecc808396b183cc1954104db9afe387e570abf288
parent5f1d5b1c7857f8680b47a7a450ee9e4530e22c6f (diff)
mesa/teximage: report the correct function which triggered the error
This function would always report that a dimension or size error occurred in glTexImage even when it was called from glCompressedTexImage. Replace the static string with the dynamically determined caller name. Reviewed-by: Tapani Palli <tapani.palli@intel.com> Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
-rw-r--r--src/mesa/main/teximage.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index fc69387204..d35dc12e2c 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3336,15 +3336,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
if (!dimensionsOK) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "glTexImage%uD(invalid width or height or depth)",
- dims);
+ "%s%uD(invalid width or height or depth)",
+ func, dims);
return;
}
if (!sizeOK) {
_mesa_error(ctx, GL_OUT_OF_MEMORY,
- "glTexImage%uD(image too large: %d x %d x %d, %s format)",
- dims, width, height, depth,
+ "%s%uD(image too large: %d x %d x %d, %s format)",
+ func, dims, width, height, depth,
_mesa_enum_to_string(internalFormat));
return;
}