deduplicate opengl renders methods definition.

1 files changed, 2 insertions, 120 deletions

diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 13546b805..3a888caca 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -56,97 +56,7 @@ class NormalOpenGLGraphics final : public Graphics
 
         ~NormalOpenGLGraphics();
 
-        bool setVideoMode(const int w, const int h,
-                          const int bpp,
-                          const bool fs,
-                          const bool hwaccel,
-                          const bool resize,
-                          const bool noFrame) override final;
-
-
-        /**
-         * Draws a resclaled version of the image
-         */
-        bool drawRescaledImage(const Image *const image,
-                               int dstX, int dstY,
-                               const int desiredWidth,
-                               const int desiredHeight) override final;
-
-        void drawPattern(const Image *const image,
-                         const int x, const int y,
-                         const int w, const int h) override final;
-
-        /**
-         * Draw a pattern based on a rescaled version of the given image...
-         */
-        void drawRescaledPattern(const Image *const image,
-                                 const int x, const int y,
-                                 const int w, const int h,
-                                 const int scaledWidth,
-                                 const int scaledHeight) override final;
-
-        void calcPattern(ImageVertexes* const vert,
-                         const Image *const image,
-                         const int x, const int y,
-                         const int w, const int h) const override final;
-
-        void calcPattern(ImageCollection* const vert,
-                         const Image *const image,
-                         const int x, const int y,
-                         const int w, const int h) const override final;
-
-        void calcTileVertexes(ImageVertexes *const vert,
-                              const Image *const image,
-                              int x, int y) const override final;
-
-        void calcTileCollection(ImageCollection *const vertCol,
-                                const Image *const image,
-                                int x, int y) override final;
-
-        void drawTileCollection(const ImageCollection *const vertCol)
-                                override final;
-
-        void drawTileVertexes(const ImageVertexes *const vert) override final;
-
-        bool calcWindow(ImageCollection *const vertCol,
-                        const int x, const int y,
-                        const int w, const int h,
-                        const ImageRect &imgRect) override final;
-
-        void updateScreen() override final;
-
-        void _beginDraw() override final;
-
-        void _endDraw() override final;
-
-        bool pushClipArea(gcn::Rectangle area) override final;
-
-        void popClipArea() override final;
-
-        void setColor(const gcn::Color &color) override final
-        {
-            mColor = color;
-            mColor2 = color;
-            mColorAlpha = (color.a != 255);
-        }
-
-        void setColorAll(const gcn::Color &color, const gcn::Color &color2)
-        {
-            mColor = color;
-            mColor2 = color2;
-            mColorAlpha = (color.a != 255);
-        }
-
-        void drawPoint(int x, int y) override final;
-
-        void drawLine(int x1, int y1, int x2, int y2) override final;
-
-        void drawRectangle(const gcn::Rectangle &rect,
-                           const bool filled);
-
-        void drawRectangle(const gcn::Rectangle &rect) override final;
-
-        void fillRectangle(const gcn::Rectangle &rect) override final;
+        #include "render/openglgraphicsdef.hpp"
 
         inline void drawQuadArrayfi(const int size);
 
@@ -170,35 +80,10 @@ class NormalOpenGLGraphics final : public Graphics
 
         inline void drawVertexes(const NormalOpenGLGraphicsVertexes &ogl);
 
-        void initArrays() override final;
-
-        static void dumpSettings();
-
-        /**
-         * Takes a screenshot and returns it as SDL surface.
-         */
-        SDL_Surface *getScreenshot() override final A_WARN_UNUSED;
-
-        void prepareScreenshot() override final;
-
         bool drawNet(const int x1, const int y1, const int x2, const int y2,
                      const int width, const int height) override final;
 
-        int getMemoryUsage() A_WARN_UNUSED;
-
-        void updateTextureFormat();
-
-        bool drawImage2(const Image *const image,
-                        int dstX, int dstY) override final;
-
-        void drawImageCached(const Image *const image,
-                             int x, int y) override final;
-
-        void drawPatternCached(const Image *const image,
-                               const int x, const int y,
-                               const int w, const int h) override final;
-
-        void completeCache() override final;
+        void initArrays() override final;
 
 #ifdef DEBUG_DRAW_CALLS
         unsigned int getDrawCalls() const
@@ -212,9 +97,6 @@ class NormalOpenGLGraphics final : public Graphics
         unsigned int getBinds() const
         { return mLastBinds; }
 #endif
-        static void bindTexture(const GLenum target, const GLuint texture);
-
-        static GLuint mLastImage;
 
     protected:
         void setTexturingAndBlending(const bool enable);