From 7fe487f9cc4cb4b7ee6a121f33b9d284bfc15ed7 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sat, 12 Mar 2011 09:17:58 +0100
Subject: ANDROID: Add more paletted texture types

---
 backends/platform/android/texture.h | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'backends/platform/android/texture.h')

diff --git a/backends/platform/android/texture.h b/backends/platform/android/texture.h
index 91ec9ff857..f00a589875 100644
--- a/backends/platform/android/texture.h
+++ b/backends/platform/android/texture.h
@@ -93,7 +93,7 @@ public:
 	};
 
 	inline bool hasPalette() const {
-		return palette_const() != 0;
+		return _palettePixelFormat.bytesPerPixel > 0;
 	}
 
 	inline bool dirty() const {
@@ -104,6 +104,10 @@ public:
 		return _pixelFormat;
 	}
 
+	inline const Graphics::PixelFormat &getPalettePixelFormat() const {
+		return _palettePixelFormat;
+	}
+
 protected:
 	inline void setDirty() {
 		_all_dirty = true;
@@ -140,6 +144,7 @@ protected:
 	Common::Rect _dirty_rect;
 
 	Graphics::PixelFormat _pixelFormat;
+	Graphics::PixelFormat _palettePixelFormat;
 };
 
 // RGBA4444 texture
@@ -178,7 +183,7 @@ public:
 class GLESPaletteTexture : public GLESTexture {
 protected:
 	GLESPaletteTexture(byte bytesPerPixel, GLenum glFormat, GLenum glType,
-						size_t paletteSize);
+						Graphics::PixelFormat palettePixelFormat);
 
 public:
 	virtual ~GLESPaletteTexture();
@@ -222,6 +227,27 @@ public:
 	virtual ~GLESPalette8888Texture();
 };
 
+// RGB565 256-entry paletted texture
+class GLESPalette565Texture : public GLESPaletteTexture {
+public:
+	GLESPalette565Texture();
+	virtual ~GLESPalette565Texture();
+};
+
+// RGBA4444 256-entry paletted texture
+class GLESPalette4444Texture : public GLESPaletteTexture {
+public:
+	GLESPalette4444Texture();
+	virtual ~GLESPalette4444Texture();
+};
+
+// RGBA5551 256-entry paletted texture
+class GLESPalette5551Texture : public GLESPaletteTexture {
+public:
+	GLESPalette5551Texture();
+	virtual ~GLESPalette5551Texture();
+};
+
 #endif
 #endif
 
-- 
cgit v1.2.3