Scarfski/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-06-08 10:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed BC4/BC5 decoding to BGRA8/RGBA32F, and silenced BC7 -Wstringop-overflow warning. Fixed #110. (#111)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-04-18 11:18:16 -07:00
committed by GitHub
parent 9114b47f53
commit 2317bb623a
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/image.cpp
View File

@@ -2391,6 +2391,8 @@ namespace bimg
uint8_t epB[6];
uint8_t epA[6];
BX_ASSUME(mi.numSubsets <= 3);
for (uint8_t ii = 0; ii < mi.numSubsets; ++ii)
{
epR[ii*2+0] = uint8_t(bit.read(mi.colorBits) << modePBits);
@@ -4650,9 +4652,16 @@ namespace bimg
{
for (uint32_t xx = 0; xx < width; ++xx)
{
decodeBlockDxt45A(temp, src);
decodeBlockDxt45A(temp+2, src);
src += 8;
for (uint32_t ii = 0; ii < 16; ++ii)
{
temp[ii*4+0] = 0;
temp[ii*4+1] = 0;
temp[ii*4+3] = 255;
}
uint8_t* block = &dst[yy*_dstPitch*4 + xx*16];
bx::memCopy(&block[0*_dstPitch], &temp[ 0], 16);
bx::memCopy(&block[1*_dstPitch], &temp[16], 16);
@@ -4682,11 +4691,8 @@ namespace bimg
for (uint32_t ii = 0; ii < 16; ++ii)
{
float nx = temp[ii*4+2]*2.0f/255.0f - 1.0f;
float ny = temp[ii*4+1]*2.0f/255.0f - 1.0f;
float nz = bx::sqrt(1.0f - nx*nx - ny*ny);
temp[ii*4+0] = uint8_t( (nz + 1.0f)*255.0f/2.0f);
temp[ii*4+3] = 0;
temp[ii*4+0] = 0;
temp[ii*4+3] = 255;
}
uint8_t* block = &dst[yy*_dstPitch*4 + xx*16];
@@ -5183,14 +5189,13 @@ namespace bimg
{
float nx = temp[ii*4+2]*2.0f/255.0f - 1.0f;
float ny = temp[ii*4+1]*2.0f/255.0f - 1.0f;
float nz = bx::sqrt(1.0f - nx*nx - ny*ny);
const uint32_t offset = (yy*4 + ii/4)*_width*16 + (xx*4 + ii%4)*16;
float* block = (float*)&dst[offset];
block[0] = nx;
block[1] = ny;
block[2] = nz;
block[3] = 0.0f;
block[2] = 0.0f;
block[3] = 1.0f;
}
}
}