22 files changed, 50 insertions, 49 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index f038fdfff..d43c8bdc8 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -90,7 +90,7 @@
 #ifdef __APPLE__
 #include <OpenGL/OpenGL.h>
 #endif
-#include "render/mgldefines.h"
+#include "render/opengl/mgldefines.h"
 #endif
 
 #include "debug.h"
diff --git a/src/render/mglxinit.cpp b/src/render/mglxinit.cpp
index d08700192..86d8b8d69 100644
--- a/src/render/mglxinit.cpp
+++ b/src/render/mglxinit.cpp
@@ -22,10 +22,11 @@
 
 #if defined(USE_OPENGL) && defined(USE_X11)
 
-#include "render/mglfunctions.h"
 #include "render/mglx.h"
 #include "render/mglxtypes.h"
 
+#include "render/opengl/mglfunctions.h"
+
 #include "debug.h"
 
 void Glx::initFunctions()
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index baca7f219..1037ebe70 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -28,10 +28,10 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
-#include "render/mgl.h"
 #ifdef __native_client__
-#include "render/naclglfunctions.h"
+#include "render/opengl/naclglfunctions.h"
 #endif
+#include "render/opengl/mgl.h"
 
 #include "render/shaders/shaderprogram.h"
 #include "render/shaders/shadersmanager.h"
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index 1a8c697a2..922068527 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -27,10 +27,10 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
-#include "render/mgl.h"
 #ifdef __native_client__
-#include "render/naclglfunctions.h"
+#include "render/opengl/naclglfunctions.h"
 #endif
+#include "render/opengl/mgl.h"
 
 #include "resources/image.h"
 #include "resources/imagerect.h"
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index 1ff55045c..ea28bec4d 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -29,10 +29,10 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
-#include "render/mgl.h"
 #ifdef __native_client__
-#include "render/naclglfunctions.h"
+#include "render/opengl/naclglfunctions.h"
 #endif
+#include "render/opengl/mgl.h"
 
 #include "render/shaders/shaderprogram.h"
 #include "render/shaders/shadersmanager.h"
diff --git a/src/render/naclgles.cpp b/src/render/naclgles.cpp
index 6451b6a36..be8ebc184 100644
--- a/src/render/naclgles.cpp
+++ b/src/render/naclgles.cpp
@@ -24,7 +24,7 @@
 
 #include "logger.h"
 
-#include "render/mglfunctions.h"
+#include "render/opengl/mglfunctions.h"
 
 #include <ppapi_simple/ps.h>
 
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 85053b7a3..358d8b13b 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -27,7 +27,7 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
-#include "render/mgl.h"
+#include "render/opengl/mgl.h"
 
 #include "resources/image.h"
 #include "resources/imagerect.h"
diff --git a/src/render/mgl.cpp b/src/render/opengl/mgl.cpp
index ccc646092..d60c8c1f6 100644
--- a/src/render/mgl.cpp
+++ b/src/render/opengl/mgl.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "render/mgl.h"
+#include "render/opengl/mgl.h"
 
 #ifdef USE_OPENGL
 
@@ -27,6 +27,6 @@
 #define defName(name) name##_t m##name = nullptr
 
 // include function defines
-#include "render/mgl.hpp"
+#include "render/opengl/mgl.hpp"
 
 #endif
diff --git a/src/render/mgl.h b/src/render/opengl/mgl.h
index d8de629a5..626e88d13 100644
--- a/src/render/mgl.h
+++ b/src/render/opengl/mgl.h
@@ -18,21 +18,21 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_MGL_H
-#define RENDER_MGL_H
+#ifndef RENDER_OPENGLMGL_H
+#define RENDER_OPENGLMGL_H
 
 #include "main.h"
 
 #ifdef USE_OPENGL
 
-#include "render/mgldefines.h"
-#include "render/mgltypes.h"
+#include "render/opengl/mgldefines.h"
+#include "render/opengl/mgltypes.h"
 
 #define defName(name) extern name##_t m##name
 
-#include "render/mgl.hpp"
+#include "render/opengl/mgl.hpp"
 
 #undef defName
 
 #endif  // USE_OPENGL
-#endif  // RENDER_MGL_H
+#endif  // RENDER_OPENGLMGL_H
diff --git a/src/render/mgl.hpp b/src/render/opengl/mgl.hpp
index edf3882cf..edf3882cf 100644
--- a/src/render/mgl.hpp
+++ b/src/render/opengl/mgl.hpp
diff --git a/src/render/mglcheck.h b/src/render/opengl/mglcheck.h
index a5804b5e1..3c7cdc73c 100644
--- a/src/render/mglcheck.h
+++ b/src/render/opengl/mglcheck.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_MGLCHECK_H
-#define RENDER_MGLCHECK_H
+#ifndef RENDER_OPENGL_MGLCHECK_H
+#define RENDER_OPENGL_MGLCHECK_H
 
 #include "main.h"
 #ifdef USE_OPENGL
@@ -28,4 +28,4 @@
 #define isGLNotNull(func) ((func) != nullptr)
 
 #endif  // USE_OPENGL
-#endif  // RENDER_MGLCHECK_H
+#endif  // RENDER_OPENGL_MGLCHECK_H
diff --git a/src/render/mgldefines.h b/src/render/opengl/mgldefines.h
index 4f765e2a4..4cf0b05d5 100644
--- a/src/render/mgldefines.h
+++ b/src/render/opengl/mgldefines.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_MGLDEFINES_H
-#define RENDER_MGLDEFINES_H
+#ifndef RENDER_OPENGL_MGLDEFINES_H
+#define RENDER_OPENGL_MGLDEFINES_H
 
 #ifdef USE_OPENGL
 
@@ -128,4 +128,4 @@
 
 #endif  // USE_OPENGL
 
-#endif  // RENDER_MGLDEFINES_H
+#endif  // RENDER_OPENGL_MGLDEFINES_H
diff --git a/src/render/mglemu.cpp b/src/render/opengl/mglemu.cpp
index 216d5ab8f..347180f2d 100644
--- a/src/render/mglemu.cpp
+++ b/src/render/opengl/mglemu.cpp
@@ -20,7 +20,7 @@
 
 #ifdef USE_OPENGL
 
-#include "render/mglemu.h"
+#include "render/opengl/mglemu.h"
 
 #include "resources/openglimagehelper.h"
 
diff --git a/src/render/mglemu.h b/src/render/opengl/mglemu.h
index bbe1a121e..f55f81013 100644
--- a/src/render/mglemu.h
+++ b/src/render/opengl/mglemu.h
@@ -18,11 +18,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_MGLEMU_H
-#define RENDER_MGLEMU_H
+#ifndef RENDER_OPENGL_MGLEMU_H
+#define RENDER_OPENGL_MGLEMU_H
 #ifdef USE_OPENGL
 
-#include "render/mgltypes.h"
+#include "render/opengl/mgltypes.h"
 
 void APIENTRY emuglTextureSubImage2D(GLuint texture,
                                      GLenum target,
@@ -38,4 +38,4 @@ void APIENTRY emuglTextureSubImage2D(GLuint texture,
 void APIENTRY emuglActiveTexture(GLenum texture);
 
 #endif  // USE_OPENGL
-#endif  // RENDER_MGLEMU_H
+#endif  // RENDER_OPENGL_MGLEMU_H
diff --git a/src/render/mglfunctions.h b/src/render/opengl/mglfunctions.h
index 8972ebb17..faf8e9300 100644
--- a/src/render/mglfunctions.h
+++ b/src/render/opengl/mglfunctions.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_MGLFUNCTIONS_H
-#define RENDER_MGLFUNCTIONS_H
+#ifndef RENDER_OPENGL_MGLFUNCTIONS_H
+#define RENDER_OPENGL_MGLFUNCTIONS_H
 
 #ifdef USE_OPENGL
 
@@ -96,4 +96,4 @@
     logger->log("emulated function: " #func)
 
 #endif  // USE_OPENGL
-#endif  // RENDER_MGLFUNCTIONS_H
+#endif  // RENDER_OPENGL_MGLFUNCTIONS_H
diff --git a/src/render/mgltypes.h b/src/render/opengl/mgltypes.h
index 1937bb6a2..5969dbeec 100644
--- a/src/render/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -18,14 +18,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_MGLTYPES_H
-#define RENDER_MGLTYPES_H
+#ifndef RENDER_OPENGL_MGLTYPES_H
+#define RENDER_OPENGL_MGLTYPES_H
 
 #include "main.h"
 
 #ifdef USE_OPENGL
 
-#include "render/mgldefines.h"
+#include "render/opengl/mgldefines.h"
 
 #ifdef ANDROID
 #include <GLES/gl.h>
@@ -206,4 +206,4 @@ typedef const char* (APIENTRY * wglGetExtensionsString_t) (HDC hdc);
 #endif
 
 #endif  // USE_OPENGL
-#endif  // RENDER_MGLTYPES_H
+#endif  // RENDER_OPENGL_MGLTYPES_H
diff --git a/src/render/naclglfunctions.h b/src/render/opengl/naclglfunctions.h
index 8691c997c..d1dad707b 100644
--- a/src/render/naclglfunctions.h
+++ b/src/render/opengl/naclglfunctions.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_NACLGLFUNCTIONS_H
-#define RENDER_NACLGLFUNCTIONS_H
+#ifndef RENDER_OPENGL_NACLGLFUNCTIONS_H
+#define RENDER_OPENGL_NACLGLFUNCTIONS_H
 
 #if defined(__native_client__) && defined(USE_OPENGL)
 
@@ -319,4 +319,4 @@ extern PP_Resource gles2Context;
     gles2Interface->VertexAttrib4fv(gles2Context, __VA_ARGS__)
 
 #endif  // defined(__native_client__) && defined(USE_OPENGL)
-#endif  // RENDER_NACLGLFUNCTIONS_H
+#endif  // RENDER_OPENGL_NACLGLFUNCTIONS_H
diff --git a/src/render/opengldebug.h b/src/render/opengl/opengldebug.h
index 4067e051e..b648c9b22 100644
--- a/src/render/opengldebug.h
+++ b/src/render/opengl/opengldebug.h
@@ -18,10 +18,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_OPENGLDEBUG_H
-#define RENDER_OPENGLDEBUG_H
+#ifndef RENDER_OPENGL_OPENGLDEBUG_H
+#define RENDER_OPENGL_OPENGLDEBUG_H
 
-#include "render/mgl.h"
+#include "render/opengl/mgl.h"
 
 #if defined(DEBUG_OPENGL) && defined(USE_OPENGL)
 #define GLDEBUG_START(text) if (mglPushGroupMarker) \
@@ -33,4 +33,4 @@
 #define GLDEBUG_END()
 #endif
 
-#endif  // RENDER_OPENGLDEBUG_H
+#endif  // RENDER_OPENGL_OPENGLDEBUG_H
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index af136cd19..71edb954d 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -23,7 +23,7 @@
 #if defined USE_OPENGL && !defined ANDROID
 #include "render/safeopenglgraphics.h"
 
-#include "render/mgl.h"
+#include "render/opengl/mgl.h"
 
 #include "resources/image.h"
 #include "resources/imagerect.h"
diff --git a/src/render/shaders/shader.cpp b/src/render/shaders/shader.cpp
index 08a2282b4..6db645ac8 100644
--- a/src/render/shaders/shader.cpp
+++ b/src/render/shaders/shader.cpp
@@ -22,7 +22,7 @@
 
 #include "render/shaders/shader.h"
 
-#include "render/mgl.h"
+#include "render/opengl/mgl.h"
 
 #include "debug.h"
 
diff --git a/src/render/shaders/shaderprogram.cpp b/src/render/shaders/shaderprogram.cpp
index 4cb4786c8..e239a3eb7 100644
--- a/src/render/shaders/shaderprogram.cpp
+++ b/src/render/shaders/shaderprogram.cpp
@@ -22,10 +22,10 @@
 
 #include "render/shaders/shaderprogram.h"
 
-#include "render/mgl.h"
 #ifdef __native_client__
-#include "render/naclglfunctions.h"
+#include "render/opengl/naclglfunctions.h"
 #endif
+#include "render/opengl/mgl.h"
 
 #include "render/shaders/shader.h"
 
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
index 9caed603d..724327b07 100644
--- a/src/render/shaders/shadersmanager.cpp
+++ b/src/render/shaders/shadersmanager.cpp
@@ -25,10 +25,10 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "render/mgl.h"
 #ifdef __native_client__
-#include "render/naclglfunctions.h"
+#include "render/opengl/naclglfunctions.h"
 #endif
+#include "render/opengl/mgl.h"
 
 #include "render/shaders/shader.h"
 #include "render/shaders/shaderprogram.h"