diff options
| author | dhewg | 2011-03-12 09:22:11 +0100 |
|---|---|---|
| committer | dhewg | 2011-03-12 09:36:22 +0100 |
| commit | caf21a357bef24ced14d8b67c7f3f6687a767570 (patch) | |
| tree | c163c09a64c4840fcdb28fac970357bd043000b3 | |
| parent | 2259f922f8c2a7b2839edf8f4ae9bbe17c1016ab (diff) | |
| download | scummvm-rg350-caf21a357bef24ced14d8b67c7f3f6687a767570.tar.gz scummvm-rg350-caf21a357bef24ced14d8b67c7f3f6687a767570.tar.bz2 scummvm-rg350-caf21a357bef24ced14d8b67c7f3f6687a767570.zip | |
ANDROID: Cleanup
| -rw-r--r-- | backends/platform/android/android.h | 2 | ||||
| -rw-r--r-- | backends/platform/android/gfx.cpp | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index f6406c4132..ba1a47a10f 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -151,7 +151,7 @@ private: #ifdef USE_RGB_COLOR Common::String getPixelFormatName(const Graphics::PixelFormat &format) const; void initTexture(GLESTexture **texture, uint width, uint height, - const Graphics::PixelFormat *format, bool alphaPalette); + const Graphics::PixelFormat *format); #endif void setupKeymapper(); diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index d0fc392681..d7650fb00c 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -98,8 +98,7 @@ Common::String OSystem_Android::getPixelFormatName(const Graphics::PixelFormat & void OSystem_Android::initTexture(GLESTexture **texture, uint width, uint height, - const Graphics::PixelFormat *format, - bool alphaPalette) { + const Graphics::PixelFormat *format) { assert(texture); Graphics::PixelFormat format_clut8 = Graphics::PixelFormat::createFormatCLUT8(); @@ -135,10 +134,7 @@ void OSystem_Android::initTexture(GLESTexture **texture, LOGE("unsupported pixel format: %s", getPixelFormatName(format_new).c_str()); - if (alphaPalette) - *texture = new GLESPalette8888Texture; - else - *texture = new GLESPalette888Texture; + *texture = new GLESPalette888Texture; } LOGD("new pixel format: %s", @@ -262,7 +258,7 @@ void OSystem_Android::initSize(uint width, uint height, GLTHREADCHECK; #ifdef USE_RGB_COLOR - initTexture(&_game_texture, width, height, format, false); + initTexture(&_game_texture, width, height, format); #else _game_texture->allocBuffer(width, height); _game_texture->fillBuffer(0); |