From 196cc38da19b867eaa9419343dd6ecd8212af354 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 8 Oct 2012 19:48:26 +0300
Subject: Fix compilation errors and warnings in different modes.

---
 src/graphicsmanager.h | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'src/graphicsmanager.h')

diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index 2373e598f..db2a8afc4 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -50,6 +50,11 @@ class GraphicsManager final
 
         void initGraphics(bool noOpenGL);
 
+        void setVideoMode();
+
+        Graphics *createGraphics();
+
+#ifdef USE_OPENGL
         TestMain *startDetection();
 
         int detectGraphics();
@@ -58,14 +63,6 @@ class GraphicsManager final
 
         void updateTextureFormat();
 
-        void logString(const char *format, int num);
-
-        std::string getGLString(int num) const;
-
-        void setGLVersion();
-
-        void setVideoMode();
-
         bool checkGLVersion(int major, int minor) const;
 
         bool checkPlatformVersion(int major, int minor) const;
@@ -84,12 +81,6 @@ class GraphicsManager final
 
         void updateLimits();
 
-        void detectVideoSettings();
-
-        Graphics *createGraphics();
-
-        void createTextureSampler();
-
         int getMaxVertices() const
         { return mMaxVertices; }
 
@@ -98,11 +89,21 @@ class GraphicsManager final
 
         void logVersion();
 
-#ifdef USE_OPENGL
+        void setGLVersion();
+
+        std::string getGLString(int num) const;
+
+        void logString(const char *format, int num);
+
+        void detectVideoSettings();
+
+        void createTextureSampler();
+
         bool isUseTextureSampler() const
         { return mUseTextureSampler; }
-#endif
+
         unsigned int getLastError();
+#endif
 
     private:
         std::set<std::string> mExtensions;
-- 
cgit v1.2.3-70-g09d2