diff options
author | Cameron Cawley | 2018-07-28 22:29:56 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-29 09:37:40 +0200 |
commit | d494d73c80027a58b7b8edd2c53893220b1c3989 (patch) | |
tree | 8c180bc8758ad0a87c5b84114ebd84cd19d716dc /backends/platform/android/gfx.cpp | |
parent | 51a2685e3ff1c6e689651e67444e5456c5977e21 (diff) | |
download | scummvm-rg350-d494d73c80027a58b7b8edd2c53893220b1c3989.tar.gz scummvm-rg350-d494d73c80027a58b7b8edd2c53893220b1c3989.tar.bz2 scummvm-rg350-d494d73c80027a58b7b8edd2c53893220b1c3989.zip |
ANDROID: Replace getPixelFormatName function with PixelFormat::toString
Diffstat (limited to 'backends/platform/android/gfx.cpp')
-rw-r--r-- | backends/platform/android/gfx.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
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); |