From 3df18942ef840e9e8dc7c38818c15af7d66b8e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 27 May 2015 19:29:06 +0200 Subject: [PATCH] Properly enable Renderer::BlendEquation::{Min,Max} on ES and WebGL. --- src/Magnum/Renderer.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index 8611db36d..c7e351c3b 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -688,23 +688,32 @@ class MAGNUM_EXPORT Renderer { enum class BlendEquation: GLenum { Add = GL_FUNC_ADD, /**< `source + destination` */ Subtract = GL_FUNC_SUBTRACT, /**< `source - destination` */ - ReverseSubtract = GL_FUNC_REVERSE_SUBTRACT /**< `destination - source` */ + ReverseSubtract = GL_FUNC_REVERSE_SUBTRACT, /**< `destination - source` */ - #ifndef MAGNUM_TARGET_GLES2 - , /** * `min(source, destination)` * @requires_gles30 Extension @es_extension2{EXT,blend_minmax,blend_minmax} - * in OpenGL ES 2.0 + * in OpenGL ES 2.0. + * @requires_webgl20 Extension @webgl_extension{EXT,blend_minmax} + * in WebGL 1.0. */ + #ifndef MAGNUM_TARGET_GLES2 Min = GL_MIN, + #else + Min = GL_MIN_EXT, + #endif /** * `max(source, destination)` * @requires_gles30 Extension @es_extension2{EXT,blend_minmax,blend_minmax} - * in OpenGL ES 2.0 + * in OpenGL ES 2.0. + * @requires_webgl20 Extension @webgl_extension{EXT,blend_minmax} + * in WebGL 1.0. */ + #ifndef MAGNUM_TARGET_GLES2 Max = GL_MAX + #else + Max = GL_MAX_EXT #endif };