diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:57:19 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:57:19 +0200 |
| commit | 166caebfaa2b217332a345ffb02c5b9e52f65a3d (patch) | |
| tree | 2de6bdc3d44a72fda18c5d070d3902d57a0e5d4a /mesalib/src/glsl/linker.cpp | |
| parent | dea8f13d8104872dec9243abe06f3d9e4c807ccd (diff) | |
| parent | 4aef26e36bc9aba4cd67c158e17f5fb93c9e018c (diff) | |
| download | vcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.tar.gz vcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.tar.bz2 vcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.zip | |
Merge remote-tracking branch 'origin/released'
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; + } } } } |