Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use etc2_decode_image decode etc1 to RGBA8888 [skip appveyor] [skip travis] 

This can avoid further texture data convert
This commit is contained in:
halx99 2020-08-31 15:32:59 +08:00
parent 8749c63346
commit b12068e1c8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cocos/platform/CCImage.cpp
View File

@ -1532,7 +1532,7 @@ bool Image::initWithETCData(const unsigned char* data, ssize_t dataLen, bool own
else else
compressedFormat = backend::PixelFormat::NONE; compressedFormat = backend::PixelFormat::NONE;
if (compressedFormat != backend::PixelFormat::NONE) if (compressedFormat != backend::PixelFormat::NONE && false)
{ {
//old opengl version has no define for GL_ETC1_RGB8_OES, add macro to make compiler happy. //old opengl version has no define for GL_ETC1_RGB8_OES, add macro to make compiler happy.
#if defined(GL_ETC1_RGB8_OES) || defined(CC_USE_METAL) #if defined(GL_ETC1_RGB8_OES) || defined(CC_USE_METAL)
@ -1552,15 +1552,13 @@ bool Image::initWithETCData(const unsigned char* data, ssize_t dataLen, bool own
CCLOG("cocos2d: Hardware ETC1 decoder not present. Using software decoder"); CCLOG("cocos2d: Hardware ETC1 decoder not present. Using software decoder");
bool ret = true; bool ret = true;
//if it is not gles or device do not support ETC, decode texture by software // if it is not gles or device do not support ETC1, decode texture by software
int bytePerPixel = 3; // directly decode ETC1_RGB to RGBA8888
unsigned int stride = _width * bytePerPixel; _pixelFormat = backend::PixelFormat::RGBA8888;
_pixelFormat = backend::PixelFormat::RGB888;
_dataLen = _width * _height * 4;
_dataLen = _width * _height * bytePerPixel;
_data = static_cast<unsigned char*>(malloc(_dataLen * sizeof(unsigned char))); _data = static_cast<unsigned char*>(malloc(_dataLen * sizeof(unsigned char)));
if (etc2_decode_image(ETC2_RGB_NO_MIPMAPS, static_cast<const unsigned char*>(data) + ETC2_PKM_HEADER_SIZE, static_cast<etc2_byte*>(_data), _width, _height) != 0)
if (etc1_decode_image(static_cast<const unsigned char*>(data) + ETC_PKM_HEADER_SIZE, static_cast<etc1_byte*>(_data), _width, _height, bytePerPixel, stride) != 0)
{ {
_dataLen = 0; _dataLen = 0;
if (_data != nullptr) if (_data != nullptr)
@ -1572,6 +1570,7 @@ bool Image::initWithETCData(const unsigned char* data, ssize_t dataLen, bool own
} }
if (ownData) free((void*)data); if (ownData) free((void*)data);
return ret; return ret;
} }