Mesa (10.2): gallium/u_blitter: fix some shader memory leaks

Carl Worth cworth at kemper.freedesktop.org
Mon Jul 14 20:58:37 UTC 2014


Module: Mesa
Branch: 10.2
Commit: d69c9114df126e84bf998f89a1fa8d628efd288a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d69c9114df126e84bf998f89a1fa8d628efd288a

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jul  9 09:38:37 2014 -0600

gallium/u_blitter: fix some shader memory leaks

The _msaa shaders weren't getting freed.
Cc: "10.2" <mesa-stable at lists.freedesktop.org>

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 378fa34c7b8ea29672deea7563c552a8e2742809)

---

 src/gallium/auxiliary/util/u_blitter.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index 7b058fe..f767d85 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -383,6 +383,15 @@ void util_blitter_destroy(struct blitter_context *blitter)
       if (ctx->fs_texfetch_stencil[i])
          ctx->delete_fs_state(pipe, ctx->fs_texfetch_stencil[i]);
 
+      if (ctx->fs_texfetch_col_msaa[i])
+         ctx->delete_fs_state(pipe, ctx->fs_texfetch_col_msaa[i]);
+      if (ctx->fs_texfetch_depth_msaa[i])
+         ctx->delete_fs_state(pipe, ctx->fs_texfetch_depth_msaa[i]);
+      if (ctx->fs_texfetch_depthstencil_msaa[i])
+         ctx->delete_fs_state(pipe, ctx->fs_texfetch_depthstencil_msaa[i]);
+      if (ctx->fs_texfetch_stencil_msaa[i])
+         ctx->delete_fs_state(pipe, ctx->fs_texfetch_stencil_msaa[i]);
+
       for (j = 0; j< Elements(ctx->fs_resolve[i]); j++)
          for (f = 0; f < 2; f++)
             if (ctx->fs_resolve[i][j][f])




More information about the mesa-commit mailing list