From fdbd1a4c521c537597b63cd4f2262517cab1f81a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 6 Oct 2012 15:26:12 +0300
Subject: Improve map draw speed in fast opengl.

---
 src/resources/image.cpp | 10 ++++------
 src/resources/image.h   |  5 ++---
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 0e2423bf9..6fa0b5bf5 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -46,6 +46,9 @@
 Image::Image(SDL_Surface *const image, const bool hasAlphaChannel0,
              uint8_t *const alphaChannel) :
     Resource(),
+#ifdef USE_OPENGL
+    mGLImage(0),
+#endif
     mLoaded(false),
     mAlpha(1.0f),
     mHasAlphaChannel(hasAlphaChannel0),
@@ -53,12 +56,7 @@ Image::Image(SDL_Surface *const image, const bool hasAlphaChannel0,
     mAlphaChannel(alphaChannel),
     mUseAlphaCache(SDLImageHelper::mEnableAlphaCache),
     mIsAlphaVisible(hasAlphaChannel0),
-#ifdef USE_OPENGL
-    mIsAlphaCalculated(false),
-    mGLImage(0)
-#else
     mIsAlphaCalculated(false)
-#endif
 {
     mBounds.x = 0;
     mBounds.y = 0;
@@ -83,6 +81,7 @@ Image::Image(SDL_Surface *const image, const bool hasAlphaChannel0,
 Image::Image(const GLuint glimage, const int width, const int height,
              const int texWidth, const int texHeight) :
     Resource(),
+    mGLImage(glimage),
     mLoaded(false),
     mAlpha(1.0f),
     mHasAlphaChannel(true),
@@ -91,7 +90,6 @@ Image::Image(const GLuint glimage, const int width, const int height,
     mUseAlphaCache(false),
     mIsAlphaVisible(true),
     mIsAlphaCalculated(false),
-    mGLImage(glimage),
     mTexWidth(texWidth),
     mTexHeight(texHeight)
 {
diff --git a/src/resources/image.h b/src/resources/image.h
index 8fafc87aa..26498e988 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -143,8 +143,6 @@ class Image : public Resource
         void SDLTerminateAlphaCache();
 
 #ifdef USE_OPENGL
-        // OpenGL only public functions
-
         int getTextureWidth() const
         { return mTexWidth; }
 
@@ -153,6 +151,8 @@ class Image : public Resource
 
         GLuint getGLImage() const
         { return mGLImage; }
+
+        GLuint mGLImage;
 #endif
 
         bool isHasAlphaChannel() const
@@ -213,7 +213,6 @@ class Image : public Resource
         Image(const GLuint glimage, const int width, const int height,
               const int texWidth, const int texHeight);
 
-        GLuint mGLImage;
         int mTexWidth, mTexHeight;
 #endif
 };
-- 
cgit v1.2.3-60-g2f50