Mesa (master): meta: Add cleanup function for Bitmap

[GitLab Mirror]

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

Author: Yevhenii Kolesnikov <yevhenii.kolesnikov at globallogic.com>
Date:   Fri Jul 12 14:53:59 2019 +0300

meta: Add cleanup function for Bitmap

Buffer object and temporary texture were never freed, causing memory leaks.

Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov at globallogic.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/mesa/drivers/common/meta.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index c636cb923d8..41722a38b38 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -112,6 +112,8 @@ static void meta_drawpix_cleanup(struct gl_context *ctx,
                                  struct drawpix_state *drawpix);
 static void meta_drawtex_cleanup(struct gl_context *ctx,
                                  struct drawtex_state *drawtex);
+static void meta_bitmap_cleanup(struct gl_context *ctx,
+                                struct bitmap_state *bitmap);
 
 void
 _mesa_meta_framebuffer_texture_image(struct gl_context *ctx,
@@ -432,6 +434,8 @@ _mesa_meta_free(struct gl_context *ctx)
    meta_decompress_cleanup(ctx, &ctx->Meta->Decompress);
    meta_drawpix_cleanup(ctx, &ctx->Meta->DrawPix);
    meta_drawtex_cleanup(ctx, &ctx->Meta->DrawTex);
+   meta_bitmap_cleanup(ctx, &ctx->Meta->Bitmap);
+
    if (old_context)
       _mesa_make_current(old_context, old_context->WinSysDrawBuffer, old_context->WinSysReadBuffer);
    else
@@ -1984,6 +1988,19 @@ meta_drawtex_cleanup(struct gl_context *ctx, struct drawtex_state *drawtex)
    }
 }
 
+static void
+meta_bitmap_cleanup(struct gl_context *ctx, struct bitmap_state *bitmap)
+{
+   if (bitmap->VAO != 0) {
+      _mesa_DeleteVertexArrays(1, &bitmap->VAO);
+      bitmap->VAO = 0;
+
+      _mesa_reference_buffer_object(ctx, &bitmap->buf_obj, NULL);
+
+      cleanup_temp_texture(ctx, &bitmap->Tex);
+   }
+}
+
 /**
  * When the glDrawPixels() image size is greater than the max rectangle
  * texture size we use this function to break the glDrawPixels() image