Mesa (master): mesa: Fix leak of uniform storage records on shader program link/free.

Eric Anholt anholt at kemper.freedesktop.org
Wed Jan 18 18:38:00 UTC 2012


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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jan 12 13:08:22 2012 -0800

mesa: Fix leak of uniform storage records on shader program link/free.

NOTE: This is a candidate for the 8.0 branch.

---

 src/mesa/main/shaderobj.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index de66851..36f208d 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -35,6 +35,7 @@
 #include "main/mfeatures.h"
 #include "main/mtypes.h"
 #include "main/shaderobj.h"
+#include "main/uniforms.h"
 #include "program/program.h"
 #include "program/prog_parameter.h"
 #include "program/hash_table.h"
@@ -276,6 +277,7 @@ _mesa_clear_shader_program_data(struct gl_context *ctx,
                                 struct gl_shader_program *shProg)
 {
    if (shProg->UniformStorage) {
+      _mesa_uniform_detach_all_driver_storage(shProg->UniformStorage);
       ralloc_free(shProg->UniformStorage);
       shProg->NumUserUniformStorage = 0;
       shProg->UniformStorage = NULL;




More information about the mesa-commit mailing list