From: Eric Anholt <eric@anholt.net>
Date: Thu, 12 Jan 2012 21:08:22 +0000 (-0800)
Subject: mesa: Fix leak of uniform storage records on shader program link/free.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f68d88034a9815445ae0a35aacc500f82f33a18;p=mesa.git

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

NOTE: This is a candidate for the 8.0 branch.
---

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index de66851e9c9..36f208d6c09 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;