Mesa (11.0): meta/generate_mipmap: Don't leak the sampler object

Emil Velikov evelikov at kemper.freedesktop.org
Thu Nov 19 12:41:16 UTC 2015


Module: Mesa
Branch: 11.0
Commit: 0b7bdb06687453cdb9755fd19215c24659846a3b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b7bdb06687453cdb9755fd19215c24659846a3b

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Nov 10 12:36:58 2015 -0800

meta/generate_mipmap: Don't leak the sampler object

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
(cherry picked from commit 758f12fd98dea9a9682becf2d496bd38ef3959e5)

---

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

diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c b/src/mesa/drivers/common/meta_generate_mipmap.c
index 5dc40a2..ced4742 100644
--- a/src/mesa/drivers/common/meta_generate_mipmap.c
+++ b/src/mesa/drivers/common/meta_generate_mipmap.c
@@ -128,6 +128,8 @@ _mesa_meta_glsl_generate_mipmap_cleanup(struct gen_mipmap_state *mipmap)
    mipmap->VAO = 0;
    _mesa_DeleteBuffers(1, &mipmap->VBO);
    mipmap->VBO = 0;
+   _mesa_DeleteSamplers(1, &mipmap->Sampler);
+   mipmap->Sampler = 0;
 
    _mesa_meta_blit_shader_table_cleanup(&mipmap->shaders);
 }




More information about the mesa-commit mailing list