From 084c8e8345a1d8cee437dcb1f257be6c968baa39 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sun, 8 Sep 2013 22:16:15 -0700 Subject: [PATCH] Fixed missing PVR3 formats. Fixed decompression checkerboard error color. --- src/image.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/image.cpp b/src/image.cpp index 777e52d8..7d75f4cc 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -915,6 +915,8 @@ namespace bgfx #define PVR3_PVRTC1_2BPP_RGBA 1 #define PVR3_PVRTC1_4BPP_RGB 2 #define PVR3_PVRTC1_4BPP_RGBA 3 +#define PVR3_PVRTC2_2BPP_RGBA 4 +#define PVR3_PVRTC2_4BPP_RGBA 5 #define PVR3_ETC1 6 #define PVR3_DXT1 7 #define PVR3_DXT2 8 @@ -937,9 +939,11 @@ namespace bgfx } s_translatePvr3Format[] = { { PVR3_PVRTC1_2BPP_RGB, PVR3_CHANNEL_TYPE_ANY, TextureFormat::PTC12 }, - { PVR3_PVRTC1_2BPP_RGBA, PVR3_CHANNEL_TYPE_ANY, TextureFormat::PTC12 }, + { PVR3_PVRTC1_2BPP_RGBA, PVR3_CHANNEL_TYPE_ANY, TextureFormat::PTC12A }, { PVR3_PVRTC1_4BPP_RGB, PVR3_CHANNEL_TYPE_ANY, TextureFormat::PTC14 }, - { PVR3_PVRTC1_4BPP_RGBA, PVR3_CHANNEL_TYPE_ANY, TextureFormat::PTC14 }, + { PVR3_PVRTC1_4BPP_RGBA, PVR3_CHANNEL_TYPE_ANY, TextureFormat::PTC14A }, + { PVR3_PVRTC2_2BPP_RGBA, PVR3_CHANNEL_TYPE_ANY, TextureFormat::PTC22 }, + { PVR3_PVRTC2_4BPP_RGBA, PVR3_CHANNEL_TYPE_ANY, TextureFormat::PTC24 }, { PVR3_ETC1, PVR3_CHANNEL_TYPE_ANY, TextureFormat::ETC1 }, { PVR3_DXT1, PVR3_CHANNEL_TYPE_ANY, TextureFormat::BC1 }, { PVR3_DXT2, PVR3_CHANNEL_TYPE_ANY, TextureFormat::BC2 }, @@ -1217,7 +1221,7 @@ namespace bgfx default: // Decompression not implemented... Make ugly red-yellow checkerboard texture. - imageCheckerboard(_width, _height, 16, UINT32_C(0xffff0000), UINT32_C(0xffffff00), _dst); + imageCheckerboard(_width, _height, 16, UINT32_C(0xff0000ff), UINT32_C(0xff00ffff), _dst); break; } }