summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shaderobj.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2012-01-12 13:08:22 -0800
committerEric Anholt <eric@anholt.net>2012-01-18 09:59:12 -0800
commit0f68d88034a9815445ae0a35aacc500f82f33a18 (patch)
tree2fc2fd7e9645a311937f1779a8111fa7bf18d5ed /src/mesa/main/shaderobj.c
parentcbd464a117317f276b65cbca69d6339166581bf7 (diff)
downloadexternal_mesa3d-0f68d88034a9815445ae0a35aacc500f82f33a18.zip
external_mesa3d-0f68d88034a9815445ae0a35aacc500f82f33a18.tar.gz
external_mesa3d-0f68d88034a9815445ae0a35aacc500f82f33a18.tar.bz2
mesa: Fix leak of uniform storage records on shader program link/free.
NOTE: This is a candidate for the 8.0 branch.
Diffstat (limited to 'src/mesa/main/shaderobj.c')
-rw-r--r--src/mesa/main/shaderobj.c2
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;