From 6346e128e17e96611dec988270e6f85345d7e612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 8 Jun 2013 13:06:20 +0200 Subject: [PATCH] Always define TextureFormat::RGB565. Don't care if its defined or not, makes it very hard to use that value. --- src/TextureFormat.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/TextureFormat.h b/src/TextureFormat.h index 9642b3397..f80a29819 100644 --- a/src/TextureFormat.h +++ b/src/TextureFormat.h @@ -517,14 +517,16 @@ enum class TextureFormat: GLenum { RGB5 = GL_RGB5, #endif - /* 1.5.6 <= GLEW < 1.8.0 doesn't have this, even if there is - GL_ARB_ES2_compatibility */ - #if defined(GL_RGB565) || defined(DOXYGEN_GENERATING_OUTPUT) /** * RGB, normalized unsigned, red and blue component 5bit, green 6bit. * @requires_gles30 %Extension @es_extension{OES,required_internalformat} */ + /* 1.5.6 <= GLEW < 1.8.0 doesn't have this, even if there is + GL_ARB_ES2_compatibility */ + #ifdef GL_RGB565 RGB565 = GL_RGB565, + #else + RGB565 = 0x8D62, #endif #ifndef MAGNUM_TARGET_GLES3