From 4aef26e36bc9aba4cd67c158e17f5fb93c9e018c Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 2 Sep 2014 18:56:18 +0200 Subject: mesa git update 2 Sep 2014 mesa commit 5a4e0f3873657d874eb5ff52819f42ea38d54b91 --- mesalib/src/glsl/linker.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mesalib/src/glsl/linker.cpp') diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index d5473adc3..57be4931d 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -2439,8 +2439,10 @@ check_explicit_uniform_locations(struct gl_context *ctx, ir_variable *var = node->as_variable(); if ((var && var->data.mode == ir_var_uniform) && var->data.explicit_location) { - if (!reserve_explicit_locations(prog, uniform_map, var)) + if (!reserve_explicit_locations(prog, uniform_map, var)) { + delete uniform_map; return; + } } } } -- cgit v1.2.3