From fb70cee2987a26969025afdf53a6dc2408633984 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 12 May 2010 18:21:58 +0000 Subject: [PATCH] I think this should fix a compilation error with OpenGL ES --- panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 8da6ed8044..cc0f69ce10 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -8828,7 +8828,6 @@ upload_texture_image(CLP(TextureContext) *gtc, break; #endif // OPENGLES // OpenGL ES will fall through. -#ifndef OPENGLES_1 // 3-d textures not supported by OpenGL ES 1. Fall through. #ifdef OPENGLES_2 case GL_TEXTURE_3D_OES: #endif @@ -8852,6 +8851,7 @@ upload_texture_image(CLP(TextureContext) *gtc, } break; #endif +#ifndef OPENGLES case GL_TEXTURE_2D_ARRAY_EXT: if (_supports_2d_texture_array) { if (image_compression == Texture::CM_off) { @@ -8868,7 +8868,7 @@ upload_texture_image(CLP(TextureContext) *gtc, return false; } break; -#endif // OPENGLES // OpenGL ES will fall through. +#endif default: if (image_compression == Texture::CM_off) {