diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-06-08 01:36:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-06-08 01:36:38 +0300 |
| commit | e05655679e7bd9488c31169ece3d404fd9160c8d (patch) | |
| tree | 1389938ad33bced4a978ce4faee9284cf99994ff /src/resources | |
| parent | 410dd6c3d845cc0e19fd678090d95669bdeb5885 (diff) | |
| download | manaverse-e05655679e7bd9488c31169ece3d404fd9160c8d.tar.gz manaverse-e05655679e7bd9488c31169ece3d404fd9160c8d.tar.bz2 manaverse-e05655679e7bd9488c31169ece3d404fd9160c8d.tar.xz manaverse-e05655679e7bd9488c31169ece3d404fd9160c8d.zip | |
copy mobileopengl into modernopengl.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/image.h | 1 | ||||
| -rw-r--r-- | src/resources/openglimagehelper.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/resources/image.h b/src/resources/image.h index cd664cebb..2c67281b7 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -69,6 +69,7 @@ class Image notfinal : public Resource #ifdef USE_OPENGL friend class AtlasManager; friend class MobileOpenGLGraphics; + friend class ModernOpenGLGraphics; friend class NormalOpenGLGraphics; friend class NullOpenGLGraphics; friend class SafeOpenGLGraphics; diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index ca5f6410a..2ce4bd405 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -29,6 +29,7 @@ #include "render/mgl.h" #include "render/mobileopenglgraphics.h" +#include "render/modernopenglgraphics.h" #include "render/normalopenglgraphics.h" #include "render/safeopenglgraphics.h" @@ -202,9 +203,11 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, { #ifndef ANDROID case RENDER_NORMAL_OPENGL: - case RENDER_MODERN_OPENGL: NormalOpenGLGraphics::bindTexture(mTextureType, texture); break; + case RENDER_MODERN_OPENGL: + ModernOpenGLGraphics::bindTexture(mTextureType, texture); + break; case RENDER_SAFE_OPENGL: SafeOpenGLGraphics::bindTexture(mTextureType, texture); break; |