From de62466eb4490dc61b1e58d31e9ec9f65b3c1547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 11 Jan 2016 01:01:15 +0100 Subject: [PATCH] Actually usable barriers in Renderer. --- src/Magnum/Renderer.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index 264836f02..056c432e6 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -1308,7 +1308,7 @@ class MAGNUM_EXPORT Renderer { * @requires_gles31 Shader load/store is not available in OpenGL ES 3.0 and older. * @requires_gles Shader load/store is not available in WebGL. */ - void setMemoryBarrier(MemoryBarriers barriers) { + static void setMemoryBarrier(MemoryBarriers barriers) { glMemoryBarrier(GLbitfield(barriers)); } @@ -1332,7 +1332,7 @@ class MAGNUM_EXPORT Renderer { * and older. * @requires_gles Shader load/store is not available in WebGL. */ - void setMemoryBarrierByRegion(MemoryBarriers barriers) { + static void setMemoryBarrierByRegion(MemoryBarriers barriers) { glMemoryBarrierByRegion(GLbitfield(barriers)); } #endif @@ -1348,7 +1348,7 @@ class MAGNUM_EXPORT Renderer { * @requires_gl45 Extension @extension{ARB,texture_barrier} * @requires_gl Texture barrier is not available in OpenGL ES or WebGL. */ - void setTextureBarrier() { + static void setTextureBarrier() { glTextureBarrier(); } #endif @@ -1568,6 +1568,8 @@ class MAGNUM_EXPORT Renderer { #endif }; +CORRADE_ENUMSET_OPERATORS(Renderer::MemoryBarriers) + /** @debugoperatorclassenum{Magnum::Renderer,Magnum::Renderer::Error} */ MAGNUM_EXPORT Debug& operator<<(Debug& debug, Renderer::Error value);