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

ASTC encoding support

Browse Source 
- Add 3rdparty/astc with lib version of the standard encoder
- Add astc_compress call for ASTC formats

- Add BIMG_CONFIG_ASTC_DECODE-gated decompression support. This is just for
  testing, the decompress code is currently too heavy to include in the core lib.
- Add fourcc support for DDS decode so ASTC and other formats not covered by
  dxgi can be read

- Add --formats option to texturec, lists all supported formats

- Update genie files -- add astc to bimg_encode and remove redundant files from
  texturec
This commit is contained in:
Andrew Willmott
2018-07-23 19:05:11 +01:00
parent 746f1053d7
commit 03ad3921ef
36 changed files with 40258 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/image.cpp
View File

@@ -3,9 +3,15 @@
* License: https://github.com/bkaradzic/bimg#license-bsd-2-clause
*/
#define BIMG_CONFIG_ASTC_DECODE 1
#include "bimg_p.h"
#include <bx/hash.h>
#if BIMG_CONFIG_ASTC_DECODE
#include "../3rdparty/astc/astc_lib.h"
#endif
namespace bimg
{
static const ImageBlockInfo s_imageBlockInfo[] =
@@ -4476,8 +4482,24 @@ namespace bimg
case TextureFormat::ASTC8x5:
case TextureFormat::ASTC8x6:
case TextureFormat::ASTC10x5:
BX_WARN(false, "ASTC decoder is not implemented.");
# 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:
@@ -5179,8 +5201,9 @@ namespace bimg
{
BX_ERROR_SCOPE(_err);
uint32_t ddspf = UINT32_MAX;
uint32_t dxgiFormat = UINT32_MAX;
uint32_t ddspf = UINT32_MAX;
uint32_t dxgiFormat = UINT32_MAX;
uint32_t fourccFormat = UINT32_MAX;
for (uint32_t ii = 0; ii < BX_COUNTOF(s_translateDdsPixelFormat); ++ii)
{
@@ -5201,14 +5224,26 @@ namespace bimg
break;
}
}
if (UINT32_MAX == dxgiFormat)
{
BX_ERROR_SET(_err, BIMG_ERROR, "DDS: DXGI format not supported.");
return 0;
}
}
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;
}
const uint32_t bpp = getBitsPerPixel(_format);
uint32_t total = 0;
@@ -5254,9 +5289,14 @@ namespace bimg
{
total += bx::write(_writer, uint32_t(8*sizeof(uint32_t) ), _err); // pixelFormatSize
total += bx::write(_writer, uint32_t(DDPF_FOURCC), _err);
total += bx::write(_writer, uint32_t(DDS_DX10), _err);
total += bx::write(_writer, uint32_t(0), _err); // bitCount
total += bx::writeRep(_writer, 0, 4*sizeof(uint32_t), _err); // bitmask
if (UINT32_MAX != fourccFormat)
total += bx::write(_writer, fourccFormat, _err);
else
total += bx::write(_writer, uint32_t(DDS_DX10), _err);
total += bx::write(_writer, uint32_t(0), _err); // bitCount
total += bx::writeRep(_writer, 0, 4*sizeof(uint32_t), _err); // bitmask
}
uint32_t caps[4] =