From 5694c2018885494fa869e5f622aab8f7d3498c44 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Mon, 14 Oct 2019 11:32:40 +0200 Subject: mesa: fix invalid target error handling for teximage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit moves the target check before using _mesa_get_current_tex_object to fix a "Mesa implementation error: bad target in _mesa_get_current_tex_object()" error. Fixes: 9dd1f7cec01 ("mesa: pass gl_texture_object as arg to not depend on state") Reviewed-by: Marek Olšák (cherry picked from commit 16233797f49359aadf104b5fe6bfff5b66914974) --- src/mesa/main/teximage.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index f90765f40fa..4174294c79b 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -2979,17 +2979,18 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, internalFormat = override_internal_format(internalFormat, width, height); + if (!no_error && + /* target error checking */ + !legal_teximage_target(ctx, dims, target)) { + _mesa_error(ctx, GL_INVALID_ENUM, "%s%uD(target=%s)", + func, dims, _mesa_enum_to_string(target)); + return; + } + if (!texObj) texObj = _mesa_get_current_tex_object(ctx, target); if (!no_error) { - /* target error checking */ - if (!legal_teximage_target(ctx, dims, target)) { - _mesa_error(ctx, GL_INVALID_ENUM, "%s%uD(target=%s)", - func, dims, _mesa_enum_to_string(target)); - return; - } - /* general error checking */ if (compressed) { if (compressed_texture_error_check(ctx, dims, target, texObj, -- cgit v1.2.3