summaryrefslogtreecommitdiff
path: root/src/graphicsmanager.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-08 19:48:26 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-08 19:48:26 +0300
commit196cc38da19b867eaa9419343dd6ecd8212af354 (patch)
treeafb2d39f88c213702a339cae6fa08f8248b5c1af /src/graphicsmanager.h
parenta80a1c69f8a5f4db88ade16e3b9d53f7b648be47 (diff)
downloadmv-196cc38da19b867eaa9419343dd6ecd8212af354.tar.gz
mv-196cc38da19b867eaa9419343dd6ecd8212af354.tar.bz2
mv-196cc38da19b867eaa9419343dd6ecd8212af354.tar.xz
mv-196cc38da19b867eaa9419343dd6ecd8212af354.zip
Fix compilation errors and warnings in different modes.
Diffstat (limited to 'src/graphicsmanager.h')
-rw-r--r--src/graphicsmanager.h33
1 files changed, 17 insertions, 16 deletions
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;