diff options
32 files changed, 94 insertions, 89 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 58472028d..020a54100 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1013,15 +1013,15 @@ SET(SRCS resources/map/metatile.h resources/map/objectslayer.cpp resources/map/objectslayer.h - render/mgl.cpp - render/mgl.h - render/mgl.hpp - render/mglcheck.h - render/mgldefines.h - render/mglemu.cpp - render/mglemu.h - render/mglfunctions.h - render/mgltypes.h + render/opengl/mgl.cpp + render/opengl/mgl.h + render/opengl/mgl.hpp + render/opengl/mglcheck.h + render/opengl/mgldefines.h + render/opengl/mglemu.cpp + render/opengl/mglemu.h + render/opengl/mglfunctions.h + render/opengl/mgltypes.h render/mglx.cpp render/mglx.h render/mglx.hpp @@ -1042,7 +1042,7 @@ SET(SRCS mumblemanager.h navigationmanager.cpp navigationmanager.h - render/naclglfunctions.h + render/opengl/naclglfunctions.h render/normalopenglgraphics.cpp render/normalopenglgraphics.h notifymanager.cpp @@ -1055,7 +1055,7 @@ SET(SRCS render/graphics_drawImageRect.hpp render/nullopenglgraphics.cpp render/nullopenglgraphics.h - render/opengldebug.h + render/opengl/opengldebug.h render/openglgraphicsdef.hpp render/openglgraphicsdef1.hpp render/openglgraphicsdefadvanced.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 10677e7b6..0a4ae4081 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -518,15 +518,15 @@ SRC += events/actionevent.h \ logger.h \ maingui.cpp \ maingui.h \ - render/mgl.cpp \ - render/mgl.h \ - render/mgl.hpp \ - render/mglcheck.h \ - render/mgldefines.h \ - render/mglemu.cpp \ - render/mglemu.h \ - render/mglfunctions.h \ - render/mgltypes.h \ + render/opengl/mgl.cpp \ + render/opengl/mgl.h \ + render/opengl/mgl.hpp \ + render/opengl/mglcheck.h \ + render/opengl/mgldefines.h \ + render/opengl/mglemu.cpp \ + render/opengl/mglemu.h \ + render/opengl/mglfunctions.h \ + render/opengl/mgltypes.h \ render/mglx.cpp \ render/mglx.h \ render/mglx.hpp \ @@ -542,7 +542,7 @@ SRC += events/actionevent.h \ render/naclfunctions.h \ render/naclgles.cpp \ render/naclgles.h \ - render/naclglfunctions.h \ + render/opengl/naclglfunctions.h \ render/normalopenglgraphics.cpp \ render/normalopenglgraphics.h \ input/mouseinput.h \ @@ -554,7 +554,7 @@ SRC += events/actionevent.h \ render/graphics_drawImageRect.hpp \ render/nullopenglgraphics.cpp \ render/nullopenglgraphics.h \ - render/opengldebug.h \ + render/opengl/opengldebug.h \ render/openglgraphicsdef.hpp \ render/openglgraphicsdef1.hpp \ render/openglgraphicsdefadvanced.hpp \ diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index d04588456..f814df04b 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -33,7 +33,7 @@ #endif // USE_SDL2 #elif defined(__native_client__) #include <GL/Regal.h> -#include "render/naclglfunctions.h" +#include "render/opengl/naclglfunctions.h" #else // ANDROID #include <GL/glx.h> #endif // ANDROID @@ -46,14 +46,15 @@ #include "settings.h" #ifdef USE_OPENGL -#include "render/mglcheck.h" -#include "render/mgl.h" -#include "render/mglemu.h" #include "render/mobileopengl2graphics.h" #include "render/mobileopenglgraphics.h" #include "render/modernopenglgraphics.h" #include "render/normalopenglgraphics.h" #include "render/safeopenglgraphics.h" + +#include "render/opengl/mgl.h" +#include "render/opengl/mglcheck.h" +#include "render/opengl/mglemu.h" #endif #include "render/renderers.h" #include "render/sdlgraphics.h" @@ -66,7 +67,7 @@ #include "resources/mobileopenglscreenshothelper.h" #include "resources/safeopenglimagehelper.h" #endif // ANDROID -#include "render/mglfunctions.h" +#include "render/opengl/mglfunctions.h" #endif // USE_OPENGL #include "resources/sdlimagehelper.h" diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 27fb7dff3..0cf8bd11b 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -29,7 +29,7 @@ #include "input/inputmanager.h" -#include "render/opengldebug.h" +#include "render/opengl/opengldebug.h" #include "resources/image.h" #include "resources/imagehelper.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index a30c2fefa..691996878 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -64,7 +64,7 @@ #include "gui/widgets/tabs/chat/tradetab.h" #include "gui/widgets/tabs/chat/whispertab.h" -#include "render/opengldebug.h" +#include "render/opengl/opengldebug.h" #include "net/chathandler.h" #include "net/serverfeatures.h" 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" diff --git a/src/resources/mobileopenglscreenshothelper.cpp b/src/resources/mobileopenglscreenshothelper.cpp index 50dbcbc64..7efb0f3b9 100644 --- a/src/resources/mobileopenglscreenshothelper.cpp +++ b/src/resources/mobileopenglscreenshothelper.cpp @@ -27,10 +27,10 @@ #include "configuration.h" #include "graphicsmanager.h" -#include "render/mgl.h" #ifdef __native_client__ -#include "render/naclglfunctions.h" +#include "render/opengl/naclglfunctions.h" #endif +#include "render/opengl/mgl.h" #include "debug.h" diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 0010d88b6..8cdf6beec 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -27,17 +27,18 @@ #include "graphicsmanager.h" #include "logger.h" -#include "render/mgl.h" -#include "render/mglcheck.h" #include "render/mobileopengl2graphics.h" #include "render/mobileopenglgraphics.h" #include "render/modernopenglgraphics.h" #ifdef __native_client__ -#include "render/naclglfunctions.h" +#include "render/opengl/naclglfunctions.h" #endif #include "render/normalopenglgraphics.h" #include "render/safeopenglgraphics.h" +#include "render/opengl/mgl.h" +#include "render/opengl/mglcheck.h" + #include "resources/dye.h" #include "resources/dyepalette.h" #include "resources/image.h" diff --git a/src/resources/openglscreenshothelper.cpp b/src/resources/openglscreenshothelper.cpp index 9d0edd80e..648ec6942 100644 --- a/src/resources/openglscreenshothelper.cpp +++ b/src/resources/openglscreenshothelper.cpp @@ -27,10 +27,10 @@ #include "configuration.h" #include "graphicsmanager.h" -#include "render/mgl.h" #ifdef __native_client__ -#include "render/naclglfunctions.h" +#include "render/opengl/naclglfunctions.h" #endif +#include "render/opengl/mgl.h" #include "debug.h" diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp index 44c8ca124..da6b750dd 100644 --- a/src/resources/safeopenglimagehelper.cpp +++ b/src/resources/safeopenglimagehelper.cpp @@ -27,14 +27,15 @@ #include "graphicsmanager.h" #include "logger.h" -#include "render/mgl.h" -#include "render/mglcheck.h" #include "render/mobileopengl2graphics.h" #include "render/mobileopenglgraphics.h" #include "render/modernopenglgraphics.h" #include "render/normalopenglgraphics.h" #include "render/safeopenglgraphics.h" +#include "render/opengl/mgl.h" +#include "render/opengl/mglcheck.h" + #include "resources/dye.h" #include "resources/dyepalette.h" #include "resources/image.h" diff --git a/src/utils/glxhelper.cpp b/src/utils/glxhelper.cpp index 42ac8ccb5..685f01760 100644 --- a/src/utils/glxhelper.cpp +++ b/src/utils/glxhelper.cpp @@ -24,11 +24,12 @@ #include "logger.h" -#include "render/mglcheck.h" -#include "render/mgldefines.h" #include "render/mglx.h" #include "render/mglxtypes.h" +#include "render/opengl/mglcheck.h" +#include "render/opengl/mgldefines.h" + #include "utils/stringutils.h" #include "debug.h" |