diff --git a/native/cocos/renderer/gfx-metal/MTLTexture.mm b/native/cocos/renderer/gfx-metal/MTLTexture.mm index ec7ac99144..912b212f9c 100644 --- a/native/cocos/renderer/gfx-metal/MTLTexture.mm +++ b/native/cocos/renderer/gfx-metal/MTLTexture.mm @@ -7,33 +7,11 @@ NS_CC_BEGIN namespace { - uint8_t* convertRGB8ToRGBA8(uint8_t* source, uint length) - { - uint finalLength = length * 4; - uint8* out = (uint8*)CC_MALLOC(finalLength); - if (!out) - { - CC_LOG_WARNING("Failed to alloc memory in convertRGB8ToRGBA8()."); - return source; - } - - uint8_t* src = source; - uint8_t* dst = out; - for (uint i = 0; i < length; ++i) - { - *dst++ = *src++; - *dst++ = *src++; - *dst++ = *src++; - *dst++ = 255; - } - - return out; - } - uint8_t* convertData(uint8_t* source, uint length, GFXFormat type) { switch (type) { - case GFXFormat::RGB8: return convertRGB8ToRGBA8(source, length); + case GFXFormat::RGB8: return mu::convertRGB8ToRGBA8(source, length); + case GFXFormat::RGB32F: return mu::convertRGB32FToRGBA32F(source, length); default: return source; } } diff --git a/native/cocos/renderer/gfx-metal/MTLUtils.h b/native/cocos/renderer/gfx-metal/MTLUtils.h index 904c66924b..a21e2a73a0 100644 --- a/native/cocos/renderer/gfx-metal/MTLUtils.h +++ b/native/cocos/renderer/gfx-metal/MTLUtils.h @@ -41,6 +41,8 @@ namespace mu MTLSamplerMinMagFilter toMTLSamplerMinMagFilter(GFXFilter); MTLSamplerMipFilter toMTLSamplerMipFilter(GFXFilter); std::string compileGLSLShader2Mtl(const std::string& src, bool isVertexShader); + uint8_t* convertRGB8ToRGBA8(uint8_t* source, uint length); + uint8_t* convertRGB32FToRGBA32F(uint8_t* source, uint length); } NS_CC_END diff --git a/native/cocos/renderer/gfx-metal/MTLUtils.mm b/native/cocos/renderer/gfx-metal/MTLUtils.mm index ce002ee3ae..5358ab275a 100644 --- a/native/cocos/renderer/gfx-metal/MTLUtils.mm +++ b/native/cocos/renderer/gfx-metal/MTLUtils.mm @@ -74,7 +74,8 @@ namespace mu GFXFormat convertGFXPixelFormat(GFXFormat format) { switch (format) { - case GFXFormat::RGB8: return GFXFormat::RGBA8; + case GFXFormat::RGB8: return GFXFormat::RGBA8; + case GFXFormat::RGB32F: return GFXFormat::RGBA32F; default: return format; } } @@ -463,6 +464,52 @@ namespace mu return src; #endif } -} + + uint8_t* convertRGB8ToRGBA8(uint8_t* source, uint length) + { + uint finalLength = length * 4; + uint8* out = (uint8*)CC_MALLOC(finalLength); + if (!out) + { + CC_LOG_WARNING("Failed to alloc memory in convertRGB8ToRGBA8()."); + return source; + } + + uint8_t* src = source; + uint8_t* dst = out; + for (uint i = 0; i < length; ++i) + { + *dst++ = *src++; + *dst++ = *src++; + *dst++ = *src++; + *dst++ = 255; + } + + return out; + } + + uint8_t* convertRGB32FToRGBA32F(uint8_t* source, uint length) + { + uint finalLength = length * sizeof(float) * 4; + uint8* out = (uint8*)CC_MALLOC(finalLength); + if (!out) + { + CC_LOG_WARNING("Failed to alloc memory in convertRGB32FToRGBA32F()."); + return source; + } + + float* src = reinterpret_cast(source); + float* dst = reinterpret_cast(out); + for (uint i = 0; i < length; ++i) + { + *dst++ = *src++; + *dst++ = *src++; + *dst++ = *src++; + *dst++ = 1.0f; + } + + return out; + } +} //namespace mu NS_CC_END