Mesa (master): meta: Don' t hang on to program refcounts after metaops are done.

Eric Anholt anholt at kemper.freedesktop.org
Wed Sep 21 17:18:26 UTC 2011


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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Sep 20 16:23:57 2011 -0700

meta: Don't hang on to program refcounts after metaops are done.

Fixes piglit ARB_shader_objects/clear-with-deleted.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39577
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/drivers/common/meta.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 9703475..b6e80d7 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -740,6 +740,11 @@ _mesa_meta_end(struct gl_context *ctx)
 
       _mesa_reference_shader_program(ctx, &ctx->Shader.ActiveProgram,
 				     save->ActiveShader);
+
+      _mesa_reference_shader_program(ctx, &save->VertexShader, NULL);
+      _mesa_reference_shader_program(ctx, &save->GeometryShader, NULL);
+      _mesa_reference_shader_program(ctx, &save->FragmentShader, NULL);
+      _mesa_reference_shader_program(ctx, &save->ActiveShader, NULL);
    }
 
    if (state & MESA_META_STENCIL_TEST) {




More information about the mesa-commit mailing list