From d34ed15b68108f92ce368c7878defc72ec046ee0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Dec 2015 16:39:30 +0300 Subject: Move OpenGLX related files into openglx directory. --- src/CMakeLists.txt | 12 +++++----- src/Makefile.am | 12 +++++----- src/render/graphics.cpp | 2 +- src/render/mglx.cpp | 32 -------------------------- src/render/mglx.h | 35 ---------------------------- src/render/mglx.hpp | 27 ---------------------- src/render/mglxinit.cpp | 43 ---------------------------------- src/render/mglxinit.h | 33 -------------------------- src/render/mglxtypes.h | 51 ----------------------------------------- src/render/openglx/mglx.cpp | 32 ++++++++++++++++++++++++++ src/render/openglx/mglx.h | 35 ++++++++++++++++++++++++++++ src/render/openglx/mglx.hpp | 27 ++++++++++++++++++++++ src/render/openglx/mglxinit.cpp | 43 ++++++++++++++++++++++++++++++++++ src/render/openglx/mglxinit.h | 33 ++++++++++++++++++++++++++ src/render/openglx/mglxtypes.h | 51 +++++++++++++++++++++++++++++++++++++++++ src/utils/glxhelper.cpp | 6 ++--- 16 files changed, 237 insertions(+), 237 deletions(-) delete mode 100644 src/render/mglx.cpp delete mode 100644 src/render/mglx.h delete mode 100644 src/render/mglx.hpp delete mode 100644 src/render/mglxinit.cpp delete mode 100644 src/render/mglxinit.h delete mode 100644 src/render/mglxtypes.h create mode 100644 src/render/openglx/mglx.cpp create mode 100644 src/render/openglx/mglx.h create mode 100644 src/render/openglx/mglx.hpp create mode 100644 src/render/openglx/mglxinit.cpp create mode 100644 src/render/openglx/mglxinit.h create mode 100644 src/render/openglx/mglxtypes.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 020a54100..d4dc28821 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1022,12 +1022,12 @@ SET(SRCS render/opengl/mglemu.h render/opengl/mglfunctions.h render/opengl/mgltypes.h - render/mglx.cpp - render/mglx.h - render/mglx.hpp - render/mglxinit.cpp - render/mglxinit.h - render/mglxtypes.h + render/openglx/mglx.cpp + render/openglx/mglx.h + render/openglx/mglx.hpp + render/openglx/mglxinit.cpp + render/openglx/mglxinit.h + render/openglx/mglxtypes.h render/mobileopengl2graphics.cpp render/mobileopengl2graphics.h render/mobileopenglgraphics.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 0a4ae4081..a69806946 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -527,12 +527,12 @@ SRC += events/actionevent.h \ render/opengl/mglemu.h \ render/opengl/mglfunctions.h \ render/opengl/mgltypes.h \ - render/mglx.cpp \ - render/mglx.h \ - render/mglx.hpp \ - render/mglxinit.cpp \ - render/mglxinit.h \ - render/mglxtypes.h \ + render/openglx/mglx.cpp \ + render/openglx/mglx.h \ + render/openglx/mglx.hpp \ + render/openglx/mglxinit.cpp \ + render/openglx/mglxinit.h \ + render/openglx/mglxtypes.h \ render/mobileopengl2graphics.cpp \ render/mobileopengl2graphics.h \ render/mobileopenglgraphics.cpp \ diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp index d43c8bdc8..127a54bc4 100644 --- a/src/render/graphics.cpp +++ b/src/render/graphics.cpp @@ -71,7 +71,7 @@ #endif #if defined(USE_OPENGL) && defined(USE_X11) -#include "render/mglxinit.h" +#include "render/openglx/mglxinit.h" #endif #include "resources/imagehelper.h" diff --git a/src/render/mglx.cpp b/src/render/mglx.cpp deleted file mode 100644 index 38821152a..000000000 --- a/src/render/mglx.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "render/mglx.h" - -#if defined(USE_OPENGL) && defined(USE_X11) - -#include "debug.h" - -#define defName(name) name##_t m##name = nullptr - -// include function defines -#include "render/mglx.hpp" - -#endif diff --git a/src/render/mglx.h b/src/render/mglx.h deleted file mode 100644 index 575041a94..000000000 --- a/src/render/mglx.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef RENDER_MGLX_H -#define RENDER_MGLX_H - -#include "main.h" - -#if defined(USE_OPENGL) && defined(USE_X11) - -#include "render/mglxtypes.h" - -#define defName(name) extern name##_t m##name -#include "render/mglx.hpp" -#undef defName - -#endif // defined(USE_OPENGL) && defined(USE_X11) -#endif // RENDER_MGLX_H diff --git a/src/render/mglx.hpp b/src/render/mglx.hpp deleted file mode 100644 index b62dd25f4..000000000 --- a/src/render/mglx.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -defName(glXCreateContext); -defName(glXGetCurrentContext); -defName(glXCreateContextAttribs); -defName(glXChooseFBConfig); -defName(glXDestroyContext); -defName(glXMakeCurrent); -defName(glXSwapBuffers); diff --git a/src/render/mglxinit.cpp b/src/render/mglxinit.cpp deleted file mode 100644 index 86d8b8d69..000000000 --- a/src/render/mglxinit.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "render/mglxinit.h" - -#if defined(USE_OPENGL) && defined(USE_X11) - -#include "render/mglx.h" -#include "render/mglxtypes.h" - -#include "render/opengl/mglfunctions.h" - -#include "debug.h" - -void Glx::initFunctions() -{ - assignFunction(glXCreateContext); - assignFunction(glXGetCurrentContext); - assignFunctionARB(glXCreateContextAttribs); - assignFunction(glXChooseFBConfig); - assignFunction(glXDestroyContext); - assignFunction(glXMakeCurrent); - assignFunction(glXSwapBuffers); -} - -#endif diff --git a/src/render/mglxinit.h b/src/render/mglxinit.h deleted file mode 100644 index 7d9503299..000000000 --- a/src/render/mglxinit.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef RENDER_MGLXINIT_H -#define RENDER_MGLXINIT_H - -#include "main.h" -#if defined(USE_OPENGL) && defined(USE_X11) - -namespace Glx -{ - void initFunctions(); -} // namespace Glx - -#endif // defined(USE_OPENGL) && defined(USE_X11) -#endif // RENDER_MGLXINIT_H diff --git a/src/render/mglxtypes.h b/src/render/mglxtypes.h deleted file mode 100644 index c639a7d80..000000000 --- a/src/render/mglxtypes.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef RENDER_MGLXTYPES_H -#define RENDER_MGLXTYPES_H - -#include "main.h" - -#if defined(USE_OPENGL) && defined(USE_X11) - -#include -#include -#include - -#if defined(__GXX_EXPERIMENTAL_CXX0X__) -#include -#else -#include -#endif - -typedef void *(*glXCreateContext_t) (Display *dpy, XVisualInfo *vis, - void *shareList, bool direct); -typedef void *(*glXGetCurrentContext_t) (void); -typedef void *(*glXCreateContextAttribs_t) (Display *dpy, GLXFBConfig config, - void *share_context, bool direct, const int *attrib_list); -typedef GLXFBConfig *(*glXChooseFBConfig_t) (Display *dpy, int screen, - const int *attrib_list, int *nelements); -typedef void (*glXDestroyContext_t) (Display *dpy, void *ctx); -typedef bool (*glXMakeCurrent_t) (Display *dpy, - GLXDrawable drawable, void *ctx); -typedef void (*glXSwapBuffers_t) (Display *dpy, GLXDrawable drawable); - -#endif // USE_OPENGL -#endif // RENDER_MGLXTYPES_H diff --git a/src/render/openglx/mglx.cpp b/src/render/openglx/mglx.cpp new file mode 100644 index 000000000..773192423 --- /dev/null +++ b/src/render/openglx/mglx.cpp @@ -0,0 +1,32 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "render/openglx/mglx.h" + +#if defined(USE_OPENGL) && defined(USE_X11) + +#include "debug.h" + +#define defName(name) name##_t m##name = nullptr + +// include function defines +#include "render/openglx/mglx.hpp" + +#endif diff --git a/src/render/openglx/mglx.h b/src/render/openglx/mglx.h new file mode 100644 index 000000000..591626bca --- /dev/null +++ b/src/render/openglx/mglx.h @@ -0,0 +1,35 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef RENDER_OPENGLX_MGLX_H +#define RENDER_OPENGLX_MGLX_H + +#include "main.h" + +#if defined(USE_OPENGL) && defined(USE_X11) + +#include "render/openglx/mglxtypes.h" + +#define defName(name) extern name##_t m##name +#include "render/openglx/mglx.hpp" +#undef defName + +#endif // defined(USE_OPENGL) && defined(USE_X11) +#endif // RENDER_OPENGLX_MGLX_H diff --git a/src/render/openglx/mglx.hpp b/src/render/openglx/mglx.hpp new file mode 100644 index 000000000..b62dd25f4 --- /dev/null +++ b/src/render/openglx/mglx.hpp @@ -0,0 +1,27 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +defName(glXCreateContext); +defName(glXGetCurrentContext); +defName(glXCreateContextAttribs); +defName(glXChooseFBConfig); +defName(glXDestroyContext); +defName(glXMakeCurrent); +defName(glXSwapBuffers); diff --git a/src/render/openglx/mglxinit.cpp b/src/render/openglx/mglxinit.cpp new file mode 100644 index 000000000..09ab8d4fe --- /dev/null +++ b/src/render/openglx/mglxinit.cpp @@ -0,0 +1,43 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "render/openglx/mglxinit.h" + +#if defined(USE_OPENGL) && defined(USE_X11) + +#include "render/opengl/mglfunctions.h" + +#include "render/openglx/mglx.h" +#include "render/openglx/mglxtypes.h" + +#include "debug.h" + +void Glx::initFunctions() +{ + assignFunction(glXCreateContext); + assignFunction(glXGetCurrentContext); + assignFunctionARB(glXCreateContextAttribs); + assignFunction(glXChooseFBConfig); + assignFunction(glXDestroyContext); + assignFunction(glXMakeCurrent); + assignFunction(glXSwapBuffers); +} + +#endif diff --git a/src/render/openglx/mglxinit.h b/src/render/openglx/mglxinit.h new file mode 100644 index 000000000..512efdf7e --- /dev/null +++ b/src/render/openglx/mglxinit.h @@ -0,0 +1,33 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef RENDER_OPENGLX_MGLXINIT_H +#define RENDER_OPENGLX_MGLXINIT_H + +#include "main.h" +#if defined(USE_OPENGL) && defined(USE_X11) + +namespace Glx +{ + void initFunctions(); +} // namespace Glx + +#endif // defined(USE_OPENGL) && defined(USE_X11) +#endif // RENDER_OPENGLX_MGLXINIT_H diff --git a/src/render/openglx/mglxtypes.h b/src/render/openglx/mglxtypes.h new file mode 100644 index 000000000..79b4afd7a --- /dev/null +++ b/src/render/openglx/mglxtypes.h @@ -0,0 +1,51 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef RENDER_OPENGLX_MGLXTYPES_H +#define RENDER_OPENGLX_MGLXTYPES_H + +#include "main.h" + +#if defined(USE_OPENGL) && defined(USE_X11) + +#include +#include +#include + +#if defined(__GXX_EXPERIMENTAL_CXX0X__) +#include +#else +#include +#endif + +typedef void *(*glXCreateContext_t) (Display *dpy, XVisualInfo *vis, + void *shareList, bool direct); +typedef void *(*glXGetCurrentContext_t) (void); +typedef void *(*glXCreateContextAttribs_t) (Display *dpy, GLXFBConfig config, + void *share_context, bool direct, const int *attrib_list); +typedef GLXFBConfig *(*glXChooseFBConfig_t) (Display *dpy, int screen, + const int *attrib_list, int *nelements); +typedef void (*glXDestroyContext_t) (Display *dpy, void *ctx); +typedef bool (*glXMakeCurrent_t) (Display *dpy, + GLXDrawable drawable, void *ctx); +typedef void (*glXSwapBuffers_t) (Display *dpy, GLXDrawable drawable); + +#endif // USE_OPENGL +#endif // RENDER_OPENGLX_MGLXTYPES_H diff --git a/src/utils/glxhelper.cpp b/src/utils/glxhelper.cpp index 685f01760..c5fb54d86 100644 --- a/src/utils/glxhelper.cpp +++ b/src/utils/glxhelper.cpp @@ -24,12 +24,12 @@ #include "logger.h" -#include "render/mglx.h" -#include "render/mglxtypes.h" - #include "render/opengl/mglcheck.h" #include "render/opengl/mgldefines.h" +#include "render/openglx/mglx.h" +#include "render/openglx/mglxtypes.h" + #include "utils/stringutils.h" #include "debug.h" -- cgit v1.2.3-70-g09d2