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-03 22:41:37 -07:00
parent e905648804
commit 3d47b9da34
4 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/bimg/bimg.h
View File

@@ -8,11 +8,12 @@
#include <stdint.h> // uint32_t
#include <stdlib.h> // NULL
#include <bx/pixelformat.h>
namespace bx
{
struct AllocatorI;
struct Error;
class Error;
struct ReaderSeekerI;
struct WriterI;
@@ -272,6 +273,29 @@ namespace bimg
///
bool imageConvert(TextureFormat::Enum _dstFormat, TextureFormat::Enum _srcFormat);
///
void imageConvert(
void* _dst
, uint32_t _bpp
, bx::PackFn _pack
, const void* _src
, bx::UnpackFn _unpack
, uint32_t _size
);
///
void imageConvert(
void* _dst
, uint32_t _dstBpp
, bx::PackFn _pack
, const void* _src
, uint32_t _srcBpp
, bx::UnpackFn _unpack
, uint32_t _width
, uint32_t _height
, uint32_t _srcPitch
);
///
bool imageConvert(
void* _dst

4
include/bimg/encode.h
View File

@@ -11,10 +11,10 @@
namespace bimg
{
///
bool imageEncodeFromRgba8(void* _dst, const void* _src, uint32_t _width, uint32_t _height, uint8_t _format);
bool imageEncodeFromRgba8(void* _dst, const void* _src, uint32_t _width, uint32_t _height, TextureFormat::Enum _format);
///
bool imageEncodeFromRgba32f(bx::AllocatorI* _allocator, void* _dst, const void* _src, uint32_t _width, uint32_t _height, uint8_t _format);
bool imageEncodeFromRgba32f(bx::AllocatorI* _allocator, void* _dst, const void* _src, uint32_t _width, uint32_t _height, TextureFormat::Enum _format);
///
void imageRgba32f11to01(void* _dst, uint32_t _width, uint32_t _height, uint32_t _pitch, const void* _src);

2
scripts/texturec.lua
View File

@@ -7,7 +7,7 @@ project "texturec"
kind "ConsoleApp"
includedirs {
path.join(BX_DIR, "include"),
path.join(BX_DIR, "include"),
path.join(BIMG_DIR, "include"),
path.join(BIMG_DIR, "3rdparty"),
path.join(BIMG_DIR, "3rdparty/nvtt"),

26
src/image_encode.cpp
View File

@@ -14,11 +14,9 @@
namespace bimg
{
bool imageEncodeFromRgba8(void* _dst, const void* _src, uint32_t _width, uint32_t _height, uint8_t _format)
bool imageEncodeFromRgba8(void* _dst, const void* _src, uint32_t _width, uint32_t _height, TextureFormat::Enum _format)
{
TextureFormat::Enum format = TextureFormat::Enum(_format);
switch (format)
switch (_format)
{
case TextureFormat::BC1:
case TextureFormat::BC2:
@@ -26,11 +24,11 @@ namespace bimg
case TextureFormat::BC4:
case TextureFormat::BC5:
squish::CompressImage( (const uint8_t*)_src, _width, _height, _dst
, format == TextureFormat::BC2 ? squish::kDxt3
: format == TextureFormat::BC3 ? squish::kDxt5
: format == TextureFormat::BC4 ? squish::kBc4
: format == TextureFormat::BC5 ? squish::kBc5
: squish::kDxt1
, _format == TextureFormat::BC2 ? squish::kDxt3
: _format == TextureFormat::BC3 ? squish::kDxt5
: _format == TextureFormat::BC4 ? squish::kBc4
: _format == TextureFormat::BC5 ? squish::kBc5
: squish::kDxt1
);
return true;
@@ -108,16 +106,14 @@ namespace bimg
break;
}
return imageConvert(_dst, format, _src, TextureFormat::RGBA8, _width, _height);
return imageConvert(_dst, _format, _src, TextureFormat::RGBA8, _width, _height);
}
bool imageEncodeFromRgba32f(bx::AllocatorI* _allocator, void* _dst, const void* _src, uint32_t _width, uint32_t _height, uint8_t _format)
bool imageEncodeFromRgba32f(bx::AllocatorI* _allocator, void* _dst, const void* _src, uint32_t _width, uint32_t _height, TextureFormat::Enum _format)
{
TextureFormat::Enum format = TextureFormat::Enum(_format);
const uint8_t* src = (const uint8_t*)_src;
switch (format)
switch (_format)
{
case TextureFormat::RGBA8:
{
@@ -164,7 +160,7 @@ namespace bimg
break;
}
return imageConvert(_dst, format, _src, TextureFormat::RGBA32F, _width, _height);
return imageConvert(_dst, _format, _src, TextureFormat::RGBA32F, _width, _height);
}
void imageRgba32f11to01(void* _dst, uint32_t _width, uint32_t _height, uint32_t _pitch, const void* _src)