From 91698d1206b86ef1710291213145275a2dd06dd7 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Fri, 7 Aug 2015 16:37:47 -0700 Subject: [PATCH] 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 Signed-off-by: Nanley Chery --- src/mesa/main/teximage.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index fc69387204f..d35dc12e2cb 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; } -- 2.30.2