Browse Source

Compile fixes for GLES 2

rdb 11 years ago
parent
commit
8c12dd1f84
2 changed files with 5 additions and 3 deletions
  1. 4 0
      panda/src/gles2gsg/gles2gsg.h
  2. 1 3
      panda/src/glstuff/glGraphicsBuffer_src.cxx

+ 4 - 0
panda/src/gles2gsg/gles2gsg.h

@@ -80,6 +80,10 @@ typedef char GLchar;
 #define GL_DEPTH_ATTACHMENT_EXT GL_DEPTH_ATTACHMENT
 #define GL_DEPTH_ATTACHMENT_EXT GL_DEPTH_ATTACHMENT
 #define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0
 #define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0
 #define GL_STENCIL_ATTACHMENT_EXT GL_STENCIL_ATTACHMENT
 #define GL_STENCIL_ATTACHMENT_EXT GL_STENCIL_ATTACHMENT
+#define GL_DEPTH_STENCIL GL_DEPTH_STENCIL_OES
+#define GL_DEPTH_STENCIL_EXT GL_DEPTH_STENCIL_OES
+#define GL_UNSIGNED_INT_24_8_EXT GL_UNSIGNED_INT_24_8_OES
+#define GL_DEPTH24_STENCIL8_EXT GL_DEPTH24_STENCIL8_OES
 #define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES
 #define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES
 #define GL_DEPTH_COMPONENT32 GL_DEPTH_COMPONENT32_OES
 #define GL_DEPTH_COMPONENT32 GL_DEPTH_COMPONENT32_OES
 #define GL_TEXTURE_3D GL_TEXTURE_3D_OES
 #define GL_TEXTURE_3D GL_TEXTURE_3D_OES

+ 1 - 3
panda/src/glstuff/glGraphicsBuffer_src.cxx

@@ -704,11 +704,9 @@ bind_slot(int layer, bool rb_resize, Texture **attach, RenderTexturePlane slot,
       } else if (_fb_properties.get_color_bits() <= 12
       } else if (_fb_properties.get_color_bits() <= 12
               && _fb_properties.get_alpha_bits() <= 4) {
               && _fb_properties.get_alpha_bits() <= 4) {
         gl_format = GL_RGBA4_OES;
         gl_format = GL_RGBA4_OES;
-#ifndef OPENGLES_1
       } else if (_fb_properties.get_color_bits() <= 15
       } else if (_fb_properties.get_color_bits() <= 15
               && _fb_properties.get_alpha_bits() == 1) {
               && _fb_properties.get_alpha_bits() == 1) {
-        gl_format = GL_RGB5_A1_EXT;
-#endif
+        gl_format = GL_RGB5_A1_OES;
       } else if (_fb_properties.get_color_bits() <= 30
       } else if (_fb_properties.get_color_bits() <= 30
               && _fb_properties.get_alpha_bits() <= 2) {
               && _fb_properties.get_alpha_bits() <= 2) {
         gl_format = GL_RGB10_A2_EXT;
         gl_format = GL_RGB10_A2_EXT;