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>
This commit is contained in:
Nanley Chery 2015-08-07 16:37:47 -07:00
parent 5f1d5b1c78
commit 91698d1206

View file

@ -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;
}