diff options
| author | Max Lingua | 2014-01-23 18:33:15 -0500 |
|---|---|---|
| committer | Max Lingua | 2014-01-23 18:33:15 -0500 |
| commit | 4ccdb3e2a30ead1fa015437306b046b69b69035b (patch) | |
| tree | e7a75774b540d871848791a6a8db9358514a97b2 /backends/platform/android/gfx.cpp | |
| parent | b69a2c81a7b0ed535e23e91928bc8ba193db744a (diff) | |
| parent | 2fe303ce3fff008a58e9750c66e707ec4e7c93d8 (diff) | |
| download | scummvm-rg350-4ccdb3e2a30ead1fa015437306b046b69b69035b.tar.gz scummvm-rg350-4ccdb3e2a30ead1fa015437306b046b69b69035b.tar.bz2 scummvm-rg350-4ccdb3e2a30ead1fa015437306b046b69b69035b.zip | |
Merge branch 'master' of git://github.com/scummvm/scummvm
Diffstat (limited to 'backends/platform/android/gfx.cpp')
| -rw-r--r-- | backends/platform/android/gfx.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index 0ce95a3cfb..9f6c759c75 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -94,6 +94,7 @@ Common::List<Graphics::PixelFormat> OSystem_Android::getSupportedFormats() const Common::List<Graphics::PixelFormat> res; res.push_back(GLES565Texture::pixelFormat()); res.push_back(GLES5551Texture::pixelFormat()); + res.push_back(GLES8888Texture::pixelFormat()); res.push_back(GLES4444Texture::pixelFormat()); res.push_back(Graphics::PixelFormat::createFormatCLUT8()); @@ -147,6 +148,8 @@ void OSystem_Android::initTexture(GLESBaseTexture **texture, *texture = new GLES565Texture(); else if (format_new == GLES5551Texture::pixelFormat()) *texture = new GLES5551Texture(); + else if (format_new == GLES8888Texture::pixelFormat()) + *texture = new GLES8888Texture(); else if (format_new == GLES4444Texture::pixelFormat()) *texture = new GLES4444Texture(); else { |