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

Fix OpenGL ES compilation

Browse Source
This commit is contained in:
rdb 2016-01-28 13:54:54 +01:00
parent 17ad8f254d
commit ffac45ce2b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8125,8 +8125,12 @@ get_component_type(Texture::ComponentType component_type) {
return GL_BYTE; return GL_BYTE;
case Texture::T_short: case Texture::T_short:
return GL_SHORT; return GL_SHORT;
#ifndef OPENGLES
case Texture::T_half_float: case Texture::T_half_float:
return GL_HALF_FLOAT; return GL_HALF_FLOAT;
#endif
default: default:
GLCAT.error() << "Invalid Texture::Type value!\n"; GLCAT.error() << "Invalid Texture::Type value!\n";
return GL_UNSIGNED_BYTE; return GL_UNSIGNED_BYTE;
@ -8546,9 +8550,12 @@ get_internal_image_format(Texture *tex, bool force_sized) const {
case Texture::F_blue: case Texture::F_blue:
case Texture::F_r16: case Texture::F_r16:
case Texture::F_r32: case Texture::F_r32:
#ifndef OPENGLES
if (get_supports_compressed_texture_format(Texture::CM_rgtc) && !is_3d) { if (get_supports_compressed_texture_format(Texture::CM_rgtc) && !is_3d) {
return GL_COMPRESSED_RED_RGTC1; return GL_COMPRESSED_RED_RGTC1;
} else if (get_supports_compressed_texture_format(Texture::CM_dxt1) && !is_3d) { }
#endif
if (get_supports_compressed_texture_format(Texture::CM_dxt1) && !is_3d) {
return GL_COMPRESSED_RGB_S3TC_DXT1_EXT; return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
} }
#ifndef OPENGLES #ifndef OPENGLES
@ -8562,9 +8569,12 @@ get_internal_image_format(Texture *tex, bool force_sized) const {
case Texture::F_rg: case Texture::F_rg:
case Texture::F_rg16: case Texture::F_rg16:
case Texture::F_rg32: case Texture::F_rg32:
#ifndef OPENGLES
if (get_supports_compressed_texture_format(Texture::CM_rgtc) && !is_3d) { if (get_supports_compressed_texture_format(Texture::CM_rgtc) && !is_3d) {
return GL_COMPRESSED_RG_RGTC2; return GL_COMPRESSED_RG_RGTC2;
} else if (get_supports_compressed_texture_format(Texture::CM_dxt1) && !is_3d) { }
#endif
if (get_supports_compressed_texture_format(Texture::CM_dxt1) && !is_3d) {
return GL_COMPRESSED_RGB_S3TC_DXT1_EXT; return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
} }
#ifndef OPENGLES #ifndef OPENGLES
@ -8995,8 +9005,10 @@ get_internal_image_format(Texture *tex, bool force_sized) const {
return force_sized ? GL_RG8 : GL_RG; return force_sized ? GL_RG8 : GL_RG;
#endif #endif
#ifndef OPENGLES
case Texture::F_rg: case Texture::F_rg:
return force_sized ? GL_RG8 : GL_RG; return force_sized ? GL_RG8 : GL_RG;
#endif
#ifndef OPENGLES_1 #ifndef OPENGLES_1
case Texture::F_srgb: case Texture::F_srgb: