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

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-04-09 16:31:03 -07:00
parent 00bc99f7e8
commit 155740489f
3 changed files with 192 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/image_decode.cpp
View File

@@ -65,55 +65,6 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_GCC("-Wshift-negative-value");
#include <stb/stb_image.h>
BX_PRAGMA_DIAGNOSTIC_POP();
namespace bimg
{
#if !defined(BIMG_IMAGE_H_HEADER_GUARD)
struct ImageMip
{
TextureFormat::Enum m_format;
uint32_t m_width;
uint32_t m_height;
uint32_t m_blockSize;
uint32_t m_size;
uint8_t m_bpp;
bool m_hasAlpha;
const uint8_t* m_data;
};
#endif // !defined(BIMG_IMAGE_H_HEADER_GUARD)
uint32_t imageGetSize(
TextureInfo* _info
, uint16_t _width
, uint16_t _height
, uint16_t _depth
, bool _cubeMap
, bool _hasMips
, uint16_t _numLayers
, TextureFormat::Enum _format
);
///
ImageContainer* imageParseBgfx(bx::AllocatorI* _allocator, const void* _src, uint32_t _size);
///
bool imageConvert(
void* _dst
, TextureFormat::Enum _dstFormat
, const void* _src
, TextureFormat::Enum _srcFormat
, uint32_t _width
, uint32_t _height
);
///
ImageContainer* imageConvert(
bx::AllocatorI* _allocator
, TextureFormat::Enum _dstFormat
, const ImageContainer& _input
);
} // namespace bimg
namespace bimg
{
static ImageContainer* imageParseLodePng(bx::AllocatorI* _allocator, const void* _data, uint32_t _size)
@@ -411,7 +362,9 @@ namespace bimg
ImageContainer* imageParse(bx::AllocatorI* _allocator, const void* _data, uint32_t _size, TextureFormat::Enum _dstFormat)
{
ImageContainer* input = imageParseBgfx (_allocator, _data, _size) ;
ImageContainer* input = imageParseDds (_allocator, _data, _size) ;
input = NULL == input ? imageParseKtx (_allocator, _data, _size) : input;
input = NULL == input ? imageParsePvr3 (_allocator, _data, _size) : input;
input = NULL == input ? imageParseLodePng (_allocator, _data, _size) : input;
input = NULL == input ? imageParseTinyExr (_allocator, _data, _size) : input;
input = NULL == input ? imageParseStbImage(_allocator, _data, _size) : input;