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

fix GL_BGRA error on gles 2

Browse Source
This commit is contained in:
rdb 2013-03-28 15:41:25 +00:00
parent a27908a7e8
commit c4c97c3571
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/gles2gsg/gles2gsg.h
View File

@ -85,6 +85,7 @@ typedef char GLchar;
#define GL_TEXTURE_3D GL_TEXTURE_3D_OES #define GL_TEXTURE_3D GL_TEXTURE_3D_OES
#define GL_MAX_3D_TEXTURE_SIZE GL_MAX_3D_TEXTURE_SIZE_OES #define GL_MAX_3D_TEXTURE_SIZE GL_MAX_3D_TEXTURE_SIZE_OES
#define GL_SAMPLER_3D GL_SAMPLER_3D_OES #define GL_SAMPLER_3D GL_SAMPLER_3D_OES
#define GL_BGRA GL_BGRA_EXT
#undef SUPPORT_IMMEDIATE_MODE #undef SUPPORT_IMMEDIATE_MODE
#define APIENTRY #define APIENTRY

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

@ -4397,11 +4397,9 @@ framebuffer_copy_to_ram(Texture *tex, int z, const DisplayRegion *dr,
GLCAT.spam(false) << "GL_BGR, "; GLCAT.spam(false) << "GL_BGR, ";
break; break;
#endif #endif
#ifndef OPENGLES_2
case GL_BGRA: case GL_BGRA:
GLCAT.spam(false) << "GL_BGRA, "; GLCAT.spam(false) << "GL_BGRA, ";
break; break;
#endif
default: default:
GLCAT.spam(false) << "unknown, "; GLCAT.spam(false) << "unknown, ";
break; break;