godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Image: Rename PVRTC{2,4} to PVRTC1_{2,4}, drop COMPRESS_PVRTC2

Browse Source 
We haven't had a proper implementation for COMPRESS_PVRTC2 (which is PVRTC1 2-bpp) in years,
so let's drop it instead of keeping a compress type which doesn't work.

The other enum values were renamed to clarify that our PVRTC2 and PVRTC4 are respectively
PVRTC1 2-bpp and PVRTC1 4-bpp. PVRTC2 2-bpp and 4-bpp are not implemented yet.
This commit is contained in:
Rémi Verschelde
2020-12-10 23:01:00 +01:00
parent 1a31274855
commit 9263f8eb4b
7 changed files with 67 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/pvr/image_compress_pvrtc.cpp
View File

@@ -36,7 +36,7 @@
#include <PvrTcEncoder.h>
#include <RgbaBitmap.h>
static void _compress_pvrtc4(Image *p_img) {
static void _compress_pvrtc1_4bpp(Image *p_img) {
Ref<Image> img = p_img->duplicate();
bool make_mipmaps = false;
@@ -53,7 +53,7 @@ static void _compress_pvrtc4(Image *p_img) {
Ref<Image> new_img;
new_img.instance();
new_img->create(img->get_width(), img->get_height(), img->has_mipmaps(), use_alpha ? Image::FORMAT_PVRTC4A : Image::FORMAT_PVRTC4);
new_img->create(img->get_width(), img->get_height(), img->has_mipmaps(), use_alpha ? Image::FORMAT_PVRTC1_4A : Image::FORMAT_PVRTC1_4);
Vector<uint8_t> data = new_img->get_data();
{
@@ -80,7 +80,5 @@ static void _compress_pvrtc4(Image *p_img) {
}
void _register_pvrtc_compress_func() {
// FIXME: We claim to support PVRTC2 but use the same method as for PVRTC4.
Image::_image_compress_pvrtc2_func = _compress_pvrtc4;
Image::_image_compress_pvrtc4_func = _compress_pvrtc4;
Image::_image_compress_pvrtc1_4bpp_func = _compress_pvrtc1_4bpp;
}