Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-18 04:53:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with decompressing DDS.

Browse Source
This commit is contained in:
bkaradzic
2012-05-01 20:16:59 -07:00
parent fb37505a8a
commit 48c8200ed3
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/renderer_gl.cpp
View File

@@ -631,11 +631,16 @@ namespace bgfx
{
fmt = s_extension[Extension::GL_EXT_texture_format_BGRA8888].m_supported ? GL_BGRA_EXT : GL_RGBA;
if (dds.m_bpp == 1)
uint8_t bpp = 4;
if (dds.m_type == 0
&& dds.m_bpp == 1)
{
fmt = GL_LUMINANCE;
bpp = 1;
}
uint8_t* bits = (uint8_t*)g_realloc(NULL, dds.m_width*dds.m_height*bpp);
for (uint32_t lod = 0, num = dds.m_numMips; lod < num; ++lod)
{
width = uint32_max(1, width);
@@ -644,9 +649,6 @@ namespace bgfx
Mip mip;
if (getRawImageData(dds, lod, _mem, mip) )
{
uint32_t srcpitch = mip.m_width*mip.m_bpp;
uint8_t* bits = (uint8_t*)g_realloc(NULL, srcpitch*mip.m_height);
mip.decode(bits);
if (GL_RGBA == fmt)
@@ -676,13 +678,13 @@ namespace bgfx
, GL_UNSIGNED_BYTE
, bits
) );
g_free(bits);
}
width >>= 1;
height >>= 1;
}
g_free(bits);
}
else
{
@@ -1139,7 +1141,7 @@ namespace bgfx
pos += len+1;
}
s_renderCtx.m_dxtSupport = false //true
s_renderCtx.m_dxtSupport = true
&& s_extension[Extension::GL_EXT_texture_compression_dxt1].m_supported
&& s_extension[Extension::GL_CHROMIUM_texture_compression_dxt3].m_supported
&& s_extension[Extension::GL_CHROMIUM_texture_compression_dxt5].m_supported