TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix luminance formats in core-profile-only OpenGL contexts

Browse Source
This commit is contained in:
rdb 2015-12-08 19:00:33 +01:00
parent 66861f137f
commit efe8ec60ee
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8644,6 +8644,7 @@ get_internal_image_format(Texture *tex, bool force_sized) const {
#endif #endif
case Texture::F_luminance: case Texture::F_luminance:
#ifdef SUPPORT_FIXED_FUNCTION
#ifndef OPENGLES #ifndef OPENGLES
if (tex->get_component_type() == Texture::T_float) { if (tex->get_component_type() == Texture::T_float) {
return GL_LUMINANCE16F_ARB; return GL_LUMINANCE16F_ARB;
@ -8656,8 +8657,12 @@ get_internal_image_format(Texture *tex, bool force_sized) const {
{ {
return force_sized ? GL_LUMINANCE8 : GL_LUMINANCE; return force_sized ? GL_LUMINANCE8 : GL_LUMINANCE;
} }
#else
return force_sized ? GL_R8 : GL_RED;
#endif
case Texture::F_luminance_alpha: case Texture::F_luminance_alpha:
case Texture::F_luminance_alphamask: case Texture::F_luminance_alphamask:
#ifdef SUPPORT_FIXED_FUNCTION
#ifndef OPENGLES #ifndef OPENGLES
if (tex->get_component_type() == Texture::T_float || tex->get_component_type() == Texture::T_unsigned_short) { if (tex->get_component_type() == Texture::T_float || tex->get_component_type() == Texture::T_unsigned_short) {
return GL_LUMINANCE_ALPHA16F_ARB; return GL_LUMINANCE_ALPHA16F_ARB;
@ -8666,6 +8671,9 @@ get_internal_image_format(Texture *tex, bool force_sized) const {
{ {
return force_sized ? GL_LUMINANCE8_ALPHA8 : GL_LUMINANCE_ALPHA; return force_sized ? GL_LUMINANCE8_ALPHA8 : GL_LUMINANCE_ALPHA;
} }
#else
return force_sized ? GL_RG8 : GL_RG;
#endif
#ifndef OPENGLES_1 #ifndef OPENGLES_1
case Texture::F_srgb: case Texture::F_srgb: