mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bad internal texture format when DXT is not supported.

Browse Source
This commit is contained in:
bkaradzic 2013-01-13 23:14:13 -08:00
parent 2ce1d2f245
commit 4779be3527
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/renderer_gl.cpp
View File

@ -1011,6 +1011,7 @@ namespace bgfx
const TextureFormatInfo& tfi = s_textureFormat[dds.m_type]; const TextureFormatInfo& tfi = s_textureFormat[dds.m_type];
GLenum internalFmt = tfi.m_internalFmt; GLenum internalFmt = tfi.m_internalFmt;
m_fmt = tfi.m_fmt; m_fmt = tfi.m_fmt;
m_type = tfi.m_type;
GLenum target = m_target; GLenum target = m_target;
if (dds.m_cubeMap) if (dds.m_cubeMap)
@ -1022,7 +1023,6 @@ namespace bgfx
|| TextureFormat::Unknown < dds.m_type) || TextureFormat::Unknown < dds.m_type)
{ {
bool decompress = TextureFormat::Unknown > dds.m_type; bool decompress = TextureFormat::Unknown > dds.m_type;
bool swizzle = GL_RGBA == m_fmt;
#if BGFX_CONFIG_RENDERER_OPENGL #if BGFX_CONFIG_RENDERER_OPENGL
if (swizzle if (swizzle
@ -1034,12 +1034,15 @@ namespace bgfx
} }
#endif // BGFX_CONFIG_RENDERER_OPENGL #endif // BGFX_CONFIG_RENDERER_OPENGL
m_type = tfi.m_type;
if (decompress) if (decompress)
{ {
m_type = GL_UNSIGNED_BYTE; const TextureFormatInfo& tfi = s_textureFormat[TextureFormat::BGRA8];
internalFmt = tfi.m_internalFmt;
m_fmt = tfi.m_fmt;
m_type = tfi.m_type;
} }
bool swizzle = GL_RGBA == m_fmt;
uint8_t* bits = (uint8_t*)g_realloc(NULL, dds.m_width*dds.m_height*4); uint8_t* bits = (uint8_t*)g_realloc(NULL, dds.m_width*dds.m_height*4);
for (uint8_t side = 0, numSides = dds.m_cubeMap ? 6 : 1; side < numSides; ++side) for (uint8_t side = 0, numSides = dds.m_cubeMap ? 6 : 1; side < numSides; ++side)