diff options
| author | Kristian Høgsberg Kristensen <[email protected]> | 2016-01-08 22:16:43 -0800 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <[email protected]> | 2016-01-08 22:16:43 -0800 |
| commit | f0993f81c7fab4ceb99b010d8ee2facbf4fdc737 (patch) | |
| tree | 2da8aeaa95a0337d9177f4d808837f7c5cbdbc25 /src/mesa/main/shaderimage.c | |
| parent | cfdc955fd5e1e965c458e50f4dc877653a463684 (diff) | |
| parent | da5d4583e53fc9cdc86aba7d2ac770e01baa158d (diff) | |
Merge ../mesa into vulkan
Diffstat (limited to 'src/mesa/main/shaderimage.c')
| -rw-r--r-- | src/mesa/main/shaderimage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/shaderimage.c b/src/mesa/main/shaderimage.c index c4ebf4201fb..040e9fd6e3c 100644 --- a/src/mesa/main/shaderimage.c +++ b/src/mesa/main/shaderimage.c @@ -738,8 +738,10 @@ _mesa_MemoryBarrierByRegion(GLbitfield barriers) * That is, if barriers is the special value GL_ALL_BARRIER_BITS, then all * barriers allowed by glMemoryBarrierByRegion should be activated." */ - if (barriers == GL_ALL_BARRIER_BITS) - return ctx->Driver.MemoryBarrier(ctx, all_allowed_bits); + if (barriers == GL_ALL_BARRIER_BITS) { + ctx->Driver.MemoryBarrier(ctx, all_allowed_bits); + return; + } /* From section 7.11.2 of the OpenGL ES 3.1 specification: * |