summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-10 16:09:39 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-10 16:09:39 +0300
commitab1ed6038406492b7d60036c3b9c5d46e7e0f754 (patch)
tree541a4fdf1031f0dd9714ac841d8f0667c8a82e9d /src
parent3881abdfade04f992208296491498f0736e5ac81 (diff)
downloadmanaverse-ab1ed6038406492b7d60036c3b9c5d46e7e0f754.tar.gz
manaverse-ab1ed6038406492b7d60036c3b9c5d46e7e0f754.tar.bz2
manaverse-ab1ed6038406492b7d60036c3b9c5d46e7e0f754.tar.xz
manaverse-ab1ed6038406492b7d60036c3b9c5d46e7e0f754.zip
Reorder defines in renderers.
Diffstat (limited to 'src')
-rw-r--r--src/render/renderers.cpp45
1 files changed, 36 insertions, 9 deletions
diff --git a/src/render/renderers.cpp b/src/render/renderers.cpp
index 7af602548..ce5174859 100644
--- a/src/render/renderers.cpp
+++ b/src/render/renderers.cpp
@@ -41,29 +41,56 @@ RenderType intToRenderType(const int mode)
return getDefault();
if (mode != RENDER_SOFTWARE
-#if defined(USE_OPENGL) && defined(ANDROID) && defined(USE_SDL2)
+#if defined(USE_OPENGL)
+
+// with OpenGL start
+#if defined(ANDROID)
+
+// with OpenGL + with ANDROID start
+#if defined(USE_SDL2)
&& mode != RENDER_GLES_OPENGL
&& mode != RENDER_SDL2_DEFAULT)
-#elif defined(USE_OPENGL) && defined(ANDROID) && !defined(USE_SDL2)
+#else // defined(USE_SDL2)
+
&& mode != RENDER_GLES_OPENGL)
-#elif defined(USE_OPENGL) && !defined(ANDROID) && defined(USE_SDL2)
+#endif // defined(USE_SDL2)
+// with OpenGL + with ANDROID end
+
+#else // defined(ANDROID)
+
+// with OpenGL + without ANDROID start
+#if defined(USE_SDL2)
&& mode != RENDER_NORMAL_OPENGL
&& mode != RENDER_MODERN_OPENGL
&& mode != RENDER_SAFE_OPENGL
&& mode != RENDER_GLES_OPENGL
&& mode != RENDER_GLES2_OPENGL
&& mode != RENDER_SDL2_DEFAULT)
-#elif !defined(USE_OPENGL) && defined(USE_SDL2)
- && mode != RENDER_SDL2_DEFAULT)
-#elif !defined(USE_OPENGL) && !defined(USE_SDL2)
- )
-#elif defined(USE_OPENGL) && !defined(ANDROID) && !defined(USE_SDL2)
+#else // defined(USE_SDL2)
+
&& mode != RENDER_NORMAL_OPENGL
&& mode != RENDER_MODERN_OPENGL
&& mode != RENDER_SAFE_OPENGL
&& mode != RENDER_GLES_OPENGL
&& mode != RENDER_GLES2_OPENGL)
-#endif
+#endif // defined(USE_SDL2)
+// with OpenGL + without ANDROID end
+
+#endif // defined(ANDROID)
+// with OpenGL end
+
+#else // defined(USE_OPENGL)
+
+// without OpenGL start
+#if defined(USE_SDL2)
+ && mode != RENDER_SDL2_DEFAULT)
+#elif !defined(USE_SDL2)
+ )
+#endif // defined(USE_SDL2)
+// without OpenGL end
+
+#endif // defined(USE_OPENGL)
+
{
return getDefault();
}