scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-27 00:53:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #384 from bullno1/color-texture-format-detection

Browse source 
Fix color texture format detection for webgl and gles < 3.0
This commit is contained in:
Branimir Karadžić 2015-05-12 17:05:15 -07:00
commit 5e33eaf65b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/renderer_gl.cpp
View file

@ -1268,6 +1268,12 @@ namespace bgfx { namespace gl
if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGLES < 30) ) if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGLES < 30) )
{ {
setTextureFormat(TextureFormat::RGBA16F, GL_RGBA, GL_RGBA, GL_HALF_FLOAT); setTextureFormat(TextureFormat::RGBA16F, GL_RGBA, GL_RGBA, GL_HALF_FLOAT);
// internalFormat and format must match:
// https://www.khronos.org/opengles/sdk/docs/man/xhtml/glTexImage2D.xml
setTextureFormat(TextureFormat::RGBA8, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE);
setTextureFormat(TextureFormat::R5G6B5, GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
setTextureFormat(TextureFormat::RGBA4, GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
setTextureFormat(TextureFormat::RGB5A1, GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
if (s_extension[Extension::OES_texture_half_float].m_supported if (s_extension[Extension::OES_texture_half_float].m_supported
|| s_extension[Extension::OES_texture_float ].m_supported) || s_extension[Extension::OES_texture_float ].m_supported)
@ -1346,7 +1352,7 @@ namespace bgfx { namespace gl
s_textureFormat[TextureFormat::R8].m_fmt = GL_LUMINANCE; s_textureFormat[TextureFormat::R8].m_fmt = GL_LUMINANCE;
} }
if (!BX_ENABLED(BX_PLATFORM_EMSCRIPTEN) ) //if (!BX_ENABLED(BX_PLATFORM_EMSCRIPTEN) )
{ {
for (uint32_t ii = 0; ii < TextureFormat::Count; ++ii) for (uint32_t ii = 0; ii < TextureFormat::Count; ++ii)
{ {