diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:56:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:56:52 +0200 |
| commit | 4aef26e36bc9aba4cd67c158e17f5fb93c9e018c (patch) | |
| tree | ff68065bef6269e38b41e6e3e57edbcf858d3efb /mesalib/src/glsl/linker.cpp | |
| parent | 04168ae281bfbd714ddf6b90d98eac892508dde8 (diff) | |
| download | vcxsrv-4aef26e36bc9aba4cd67c158e17f5fb93c9e018c.tar.gz vcxsrv-4aef26e36bc9aba4cd67c158e17f5fb93c9e018c.tar.bz2 vcxsrv-4aef26e36bc9aba4cd67c158e17f5fb93c9e018c.zip | |
mesa git update 2 Sep 2014
mesa commit 5a4e0f3873657d874eb5ff52819f42ea38d54b91
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
| -rw-r--r-- | mesalib/src/glsl/linker.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; + } } } } |