Mesa (master): mesa: Free uniforms correclty.

Stephane Marchesin marcheu at kemper.freedesktop.org
Tue Jun 12 21:48:44 UTC 2012


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

Author: Antoine Labour <piman at chromium.org>
Date:   Thu May 24 18:15:44 2012 -0700

mesa: Free uniforms correclty.

This is an array of uniforms, not a single one.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

NOTE: This is a candidate for the 8.0 branch.

---

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

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




More information about the mesa-commit mailing list