diff options
| -rw-r--r-- | backends/platform/android/android.h | 1 | ||||
| -rw-r--r-- | backends/platform/android/gfx.cpp | 23 |
2 files changed, 3 insertions, 21 deletions
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index c261f85325..3a9d391ea9 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -157,7 +157,6 @@ private: void initOverlay(); #ifdef USE_RGB_COLOR - Common::String getPixelFormatName(const Graphics::PixelFormat &format) const; void initTexture(GLESBaseTexture **texture, uint width, uint height, const Graphics::PixelFormat *format); #endif diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index a4f1746cb7..58c92adbdf 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -101,23 +101,6 @@ Common::List<Graphics::PixelFormat> OSystem_Android::getSupportedFormats() const return res; } -Common::String OSystem_Android::getPixelFormatName(const Graphics::PixelFormat &format) const { - if (format.bytesPerPixel == 1) - return "CLUT8"; - - if (format.aLoss == 8) - return Common::String::format("RGB%u%u%u", - 8 - format.rLoss, - 8 - format.gLoss, - 8 - format.bLoss); - - return Common::String::format("RGBA%u%u%u%u", - 8 - format.rLoss, - 8 - format.gLoss, - 8 - format.bLoss, - 8 - format.aLoss); -} - void OSystem_Android::initTexture(GLESBaseTexture **texture, uint width, uint height, const Graphics::PixelFormat *format) { @@ -140,7 +123,7 @@ void OSystem_Android::initTexture(GLESBaseTexture **texture, if (format_current != format_new) { if (*texture) LOGD("switching pixel format from: %s", - getPixelFormatName((*texture)->getPixelFormat()).c_str()); + (*texture)->getPixelFormat().toString().c_str()); delete *texture; @@ -156,13 +139,13 @@ void OSystem_Android::initTexture(GLESBaseTexture **texture, // TODO what now? if (format_new != format_clut8) LOGE("unsupported pixel format: %s", - getPixelFormatName(format_new).c_str()); + format_new.toString().c_str()); *texture = new GLESFakePalette565Texture; } LOGD("new pixel format: %s", - getPixelFormatName((*texture)->getPixelFormat()).c_str()); + (*texture)->getPixelFormat().toString().c_str()); } (*texture)->allocBuffer(width, height); |