Mesa (main): mesa: add missing unlock_texture into generate_texture_mipmap

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Oct 6 00:12:41 UTC 2021


Module: Mesa
Branch: main
Commit: 8f68978caa2ff1a3ebb97b994b8db034a441644f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f68978caa2ff1a3ebb97b994b8db034a441644f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Oct  5 18:06:08 2021 -0400

mesa: add missing unlock_texture into generate_texture_mipmap

Fixes: 5a39938b0004de36ac55 "mesa: Throw an error for compressed glGenerateMipmap on GLES2 contexts."

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13152>

---

 src/mesa/main/genmipmap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/main/genmipmap.c b/src/mesa/main/genmipmap.c
index 8bf3b1ad568..bcb8ac9c407 100644
--- a/src/mesa/main/genmipmap.c
+++ b/src/mesa/main/genmipmap.c
@@ -160,6 +160,7 @@ generate_texture_mipmap(struct gl_context *ctx,
        */
       if (ctx->API == API_OPENGLES2 && ctx->Version < 30 &&
           _mesa_is_format_compressed(srcImage->TexFormat)) {
+         _mesa_unlock_texture(ctx, texObj);
          _mesa_error(ctx, GL_INVALID_OPERATION, "generate mipmaps on compressed texture");
          return;
       }



More information about the mesa-commit mailing list