From e2e9b4b10fcf3ba6358b9be54638f850523af82e Mon Sep 17 00:00:00 2001 From: Antoine Labour Date: Thu, 24 May 2012 18:15:44 -0700 Subject: mesa: Free uniforms correclty. This is an array of uniforms, not a single one. Reviewed-by: Ian Romanick NOTE: This is a candidate for the 8.0 branch. --- src/mesa/main/shaderobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 7eb6f0bdab0..d5ebf54af8e 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -278,7 +278,8 @@ _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); + for (unsigned i = 0; i < shProg->NumUserUniformStorage; ++i) + _mesa_uniform_detach_all_driver_storage(&shProg->UniformStorage[i]); ralloc_free(shProg->UniformStorage); shProg->NumUserUniformStorage = 0; shProg->UniformStorage = NULL; -- cgit v1.2.3