From: Jian Zhao Date: Sat, 24 Dec 2011 14:58:12 +0000 (-0700) Subject: mesa: move the format and type check before select_tex_image() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26195c8417e710e919352ec6b4dfff83fdc178e2;p=mesa.git mesa: move the format and type check before select_tex_image() Move the format and type check before select_tex_image, or it will fail to report the mismatch error if the teximage is null. Reported-by: Anuj Phogat Signed-off-by: Jian Zhao Reviewed-by: Yuanhan Liu Signed-off-by: Brian Paul --- diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 3f24187292b..6ead871f63b 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -702,12 +702,6 @@ getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level, return GL_TRUE; } - texImage = _mesa_select_tex_image(ctx, texObj, target, level); - if (!texImage) { - /* out of memory */ - return GL_TRUE; - } - if (!_mesa_is_legal_format_and_type(ctx, format, type)) { /*GL_INVALID_OPERATION is generated by a format/type * mismatch (see the 1.2 spec page 94, sec 3.6.4.) @@ -716,6 +710,12 @@ getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level, return GL_TRUE; } + texImage = _mesa_select_tex_image(ctx, texObj, target, level); + if (!texImage) { + /* out of memory */ + return GL_TRUE; + } + baseFormat = _mesa_get_format_base_format(texImage->TexFormat); /* Make sure the requested image format is compatible with the