diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-26 13:33:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-26 13:48:26 +0300 |
| commit | 75a80fdfdce4be53ce7d7b1d02400d3f79a144c0 (patch) | |
| tree | ac13334dd960a3dfb65aaebbba247e6245d1e104 /src/resources | |
| parent | 9abb51fce0cca32ebe267c4797363d99520c2a0a (diff) | |
| download | manaplus-75a80fdfdce4be53ce7d7b1d02400d3f79a144c0.tar.gz manaplus-75a80fdfdce4be53ce7d7b1d02400d3f79a144c0.tar.bz2 manaplus-75a80fdfdce4be53ce7d7b1d02400d3f79a144c0.tar.xz manaplus-75a80fdfdce4be53ce7d7b1d02400d3f79a144c0.zip | |
Android compilation fixes.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/openglimagehelper.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 3f825d9db..7e5c77c7f 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -218,12 +218,17 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage) glGenTextures(1, &texture); switch (mUseOpenGL) { +#ifndef ANDROID case 1: NormalOpenGLGraphics::bindTexture(mTextureType, texture); break; case 2: SafeOpenGLGraphics::bindTexture(mTextureType, texture); break; +#else + case 1: + case 2: +#endif case 3: MobileOpenGLGraphics::bindTexture(mTextureType, texture); break; @@ -250,7 +255,9 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage) glTexParameteri(mTextureType, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } } +#ifndef ANDROID glTexParameteri(mTextureType, GL_TEXTURE_MAX_LEVEL, 0); +#endif glTexImage2D(mTextureType, 0, mInternalTextureType, tmpImage->w, tmpImage->h, |