TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

android: fix error when uploading BGRA image

Browse Source
This commit is contained in:
rdb 2017-04-03 01:41:28 +02:00
parent 6f8b379bda
commit 2980bbc955
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -9260,18 +9260,22 @@ get_internal_image_format(Texture *tex, bool force_sized) const {
return GL_RGBA16F; return GL_RGBA16F;
} else } else
#endif #endif
#ifndef OPENGLES #ifdef OPENGLES
{
// In OpenGL ES, the internal format must match the external format.
return _supports_bgr ? GL_BGRA : GL_RGBA;
}
#else
if (tex->get_component_type() == Texture::T_unsigned_short) { if (tex->get_component_type() == Texture::T_unsigned_short) {
return GL_RGBA16; return GL_RGBA16;
} else if (tex->get_component_type() == Texture::T_short) { } else if (tex->get_component_type() == Texture::T_short) {
return GL_RGBA16_SNORM; return GL_RGBA16_SNORM;
} else if (tex->get_component_type() == Texture::T_byte) { } else if (tex->get_component_type() == Texture::T_byte) {
return GL_RGBA8_SNORM; return GL_RGBA8_SNORM;
} else } else {
#endif
{
return force_sized ? GL_RGBA8 : GL_RGBA; return force_sized ? GL_RGBA8 : GL_RGBA;
} }
#endif
case Texture::F_rgba4: case Texture::F_rgba4:
return GL_RGBA4; return GL_RGBA4;
@ -12702,6 +12706,9 @@ upload_simple_texture(CLP(TextureContext) *gtc) {
_data_transferred_pcollector.add_level(image_size); _data_transferred_pcollector.add_level(image_size);
#endif #endif
#ifdef OPENGLES
internal_format = external_format;
#endif
glTexImage2D(GL_TEXTURE_2D, 0, internal_format, glTexImage2D(GL_TEXTURE_2D, 0, internal_format,
width, height, 0, width, height, 0,
external_format, component_type, image_ptr); external_format, component_type, image_ptr);