diff --git a/core/rend/TexCache.cpp b/core/rend/TexCache.cpp index eec652c83..80d3fca62 100644 --- a/core/rend/TexCache.cpp +++ b/core/rend/TexCache.cpp @@ -403,7 +403,7 @@ static const PvrTexInfo format[8] = {"565", 16, TextureType::_565, tex565_PL, tex565_TW, tex565_VQ, tex565_PL32, tex565_TW32, tex565_VQ32 }, //565 {"4444", 16, TextureType::_4444, tex4444_PL, tex4444_TW, tex4444_VQ, tex4444_PL32, tex4444_TW32, tex4444_VQ32 }, //4444 {"yuv", 16, TextureType::_8888, NULL, NULL, NULL, texYUV422_PL, texYUV422_TW, texYUV422_VQ }, //yuv - {"bumpmap", 16, TextureType::_4444, texBMP_PL, texBMP_TW, texBMP_VQ, NULL}, //bump map + {"bumpmap", 16, TextureType::_4444, texBMP_PL, texBMP_TW, texBMP_VQ, tex4444_PL32, tex4444_TW32, tex4444_VQ32 }, //bump map {"pal4", 4, TextureType::_5551, 0, texPAL4_TW, texPAL4_VQ, NULL, texPAL4_TW32, texPAL4_VQ32 }, //pal4 {"pal8", 8, TextureType::_5551, 0, texPAL8_TW, texPAL8_VQ, NULL, texPAL8_TW32, texPAL8_VQ32 }, //pal8 {"ns/1555", 0}, // Not supported (1555) diff --git a/core/rend/TexCache.h b/core/rend/TexCache.h index e50b5b038..1e8fcf54f 100644 --- a/core/rend/TexCache.h +++ b/core/rend/TexCache.h @@ -223,14 +223,6 @@ pixelcvt_next(conv4444_PL,4,1) //3,0 pb->prel(3,ARGB4444(p_in[3])); } -pixelcvt_next(convBMP_PL,4,1) -{ - u16* p_in=(u16*)data; - pb->prel(0,ARGB4444(p_in[0])); - pb->prel(1,ARGB4444(p_in[1])); - pb->prel(2,ARGB4444(p_in[2])); - pb->prel(3,ARGB4444(p_in[3])); -} pixelcvt_end; // 32-bit pixel buffer @@ -350,14 +342,6 @@ pixelcvt_next(conv4444_TW,2,2) //1,1 pb->prel(1,1,ARGB4444(p_in[3])); } -pixelcvt_next(convBMP_TW,2,2) -{ - u16* p_in=(u16*)data; - pb->prel(0,0,ARGB4444(p_in[0])); - pb->prel(0,1,ARGB4444(p_in[1])); - pb->prel(1,0,ARGB4444(p_in[2])); - pb->prel(1,1,ARGB4444(p_in[3])); -} pixelcvt_end; // 32-bit pixel buffer @@ -562,14 +546,12 @@ template void texture_PL, u16>(PixelBuffer* pb,u8* p_in, template void texture_PL, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_PL, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_PL, u32>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); -template void texture_PL, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); //twiddled formats ! template void texture_TW, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_TW, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_TW, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_TW, u32>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); -template void texture_TW, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_TW, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_TW, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); @@ -581,14 +563,13 @@ template void texture_VQ, u16>(PixelBuffer* pb,u8* p_in, template void texture_VQ, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_VQ, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); template void texture_VQ, u32>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); -template void texture_VQ, u16>(PixelBuffer* pb,u8* p_in,u32 Width,u32 Height); //Planar #define tex565_PL texture_PL, u16> #define tex1555_PL texture_PL, u16> #define tex4444_PL texture_PL, u16> #define texYUV422_PL texture_PL, u32> -#define texBMP_PL texture_PL, u16> +#define texBMP_PL tex4444_PL #define tex565_PL32 texture_PL, u32> #define tex1555_PL32 texture_PL, u32> @@ -599,7 +580,7 @@ template void texture_VQ, u16>(PixelBuffer* pb,u8* p_in, #define tex1555_TW texture_TW, u16> #define tex4444_TW texture_TW, u16> #define texYUV422_TW texture_TW, u32> -#define texBMP_TW texture_TW, u16> +#define texBMP_TW tex4444_TW #define texPAL4_TW texture_TW, u16> #define texPAL8_TW texture_TW, u16> #define texPAL4_TW32 texture_TW, u32> @@ -614,7 +595,7 @@ template void texture_VQ, u16>(PixelBuffer* pb,u8* p_in, #define tex1555_VQ texture_VQ, u16> #define tex4444_VQ texture_VQ, u16> #define texYUV422_VQ texture_VQ, u32> -#define texBMP_VQ texture_VQ, u16> +#define texBMP_VQ tex4444_VQ // According to the documentation, a texture cannot be compressed and use // a palette at the same time. However the hardware displays them // just fine.