From Claus Steuer, "XCode 6, IOs 8.1 SDK Compile fix : There are some undefined texture formats when compiling osg for IOs 8.1 with XCode 6 and OpenGLES2 enabled."

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14510 16af8721-9629-0410-8352-f15c8da7e697
10 years ago · 5da4e80e95
parent f8c4ad4b90
commit 5da4e80e95
1 changed files with 16 additions and 2 deletions
--- a/include/osg/Texture
+++ b/include/osg/Texture
@ -306,8 +306,22 @@
 #endif
 #ifndef GL_VERSION_1_1
-#define GL_R3_G3_B2                             0x2A10
+#define GL_R3_G3_B2                       0x2A10
-#define GL_RGB4                                 0x804F
+#define GL_RGB4                           0x804F
 #define GL_RGB5                           0x8050
 #define GL_RGB8                           0x8051
 #define GL_RGB10                          0x8052
 #define GL_RGB12                          0x8053
 #define GL_RGB16                          0x8054
 #define GL_RGBA2                          0x8055
 #define GL_RGBA4                          0x8056
 #define GL_RGB5_A1                        0x8057
 #define GL_RGBA8                          0x8058
 #define GL_RGB10_A2                       0x8059
 #define GL_RGBA12                         0x805A
 #define GL_RGBA16                         0x805B
 #define GL_BGR_EXT                        0x80E0
 #define GL_BGRA_EXT                       0x80E1
 #endif
 #ifndef GL_ARB_texture_rg