Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 20:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added astc-codec decoder.

Browse Source
This commit is contained in:
Бранимир Караџић
2019-02-16 13:11:06 -08:00
parent c299a8d593
commit 7ad9c896ba
130 changed files with 13342 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/image.cpp
View File

@@ -6,9 +6,9 @@
#include "bimg_p.h"
#include <bx/hash.h>
#if BIMG_CONFIG_ASTC_DECODE
# include "../3rdparty/astc/astc_lib.h"
#endif // BIMG_CONFIG_ASTC_DECODE
#include <astc-codec/astc-codec.h>
#include <bx/debug.h>
namespace bimg
{
@@ -4518,32 +4518,6 @@ namespace bimg
}
break;
case TextureFormat::ASTC4x4:
case TextureFormat::ASTC5x5:
case TextureFormat::ASTC6x6:
case TextureFormat::ASTC8x5:
case TextureFormat::ASTC8x6:
case TextureFormat::ASTC10x5:
#if BIMG_CONFIG_ASTC_DECODE
astc_decompress
(
(const uint8_t*) _src,
s_imageBlockInfo[_srcFormat].blockWidth,
s_imageBlockInfo[_srcFormat].blockHeight,
ASTC_DECODE_LDR_LINEAR,
_width,
_height,
(uint8_t*) _dst,
ASTC_BGRA,
_dstPitch
);
#else
BX_WARN(false, "ASTC decoder is not implemented.");
imageCheckerboard(_dst, _width, _height, 16, UINT32_C(0xff000000), UINT32_C(0xffffff00) );
#endif
break;
case TextureFormat::RGBA8:
{
const uint32_t srcPitch = _width * 4;
@@ -4592,6 +4566,32 @@ namespace bimg
}
break;
case TextureFormat::ASTC4x4:
case TextureFormat::ASTC5x5:
case TextureFormat::ASTC6x6:
case TextureFormat::ASTC8x5:
case TextureFormat::ASTC8x6:
case TextureFormat::ASTC10x5:
if (!astc_codec::ASTCDecompressToRGBA(
(const uint8_t*)_src
, imageGetSize(NULL, uint16_t(_width), uint16_t(_height), 0, false, false, 1, _srcFormat)
, _width
, _height
, TextureFormat::ASTC4x4 == _srcFormat ? astc_codec::FootprintType::k4x4
: TextureFormat::ASTC5x5 == _srcFormat ? astc_codec::FootprintType::k5x5
: TextureFormat::ASTC6x6 == _srcFormat ? astc_codec::FootprintType::k6x6
: TextureFormat::ASTC8x5 == _srcFormat ? astc_codec::FootprintType::k8x5
: TextureFormat::ASTC8x6 == _srcFormat ? astc_codec::FootprintType::k8x6
: astc_codec::FootprintType::k10x5
, (uint8_t*)_dst
, _width*_height*4
, _dstPitch
) )
{
imageCheckerboard(_dst, _width, _height, 16, UINT32_C(0xff000000), UINT32_C(0xffffff00) );
}
break;
default:
{
const uint32_t srcPitch = _width * 4;
@@ -5263,23 +5263,25 @@ namespace bimg
}
}
if (UINT32_MAX == ddspf && UINT32_MAX == dxgiFormat)
{
for (uint32_t ii = 0; ii < BX_COUNTOF(s_translateDdsFourccFormat); ++ii)
{
if (s_translateDdsFourccFormat[ii].m_textureFormat == _format)
{
fourccFormat = s_translateDdsFourccFormat[ii].m_format;
break;
}
}
}
if (UINT32_MAX == ddspf && UINT32_MAX == dxgiFormat)
{
for (uint32_t ii = 0; ii < BX_COUNTOF(s_translateDdsFourccFormat); ++ii)
{
if (s_translateDdsFourccFormat[ii].m_textureFormat == _format)
{
fourccFormat = s_translateDdsFourccFormat[ii].m_format;
break;
}
}
}
if (UINT32_MAX == ddspf && UINT32_MAX == dxgiFormat && UINT32_MAX == fourccFormat)
{
BX_ERROR_SET(_err, BIMG_ERROR, "DDS: output format not supported.");
return 0;
}
if (UINT32_MAX == ddspf
&& UINT32_MAX == dxgiFormat
&& UINT32_MAX == fourccFormat)
{
BX_ERROR_SET(_err, BIMG_ERROR, "DDS: output format not supported.");
return 0;
}
const uint32_t bpp = getBitsPerPixel(_format);