Changeset 10820

Timestamp:

11/24/09 14:24:30 (3 years ago)

Author:

robert

Message:

From Wojciech Lewandowski, "I have extended a list of texture targets that can be used with shadow comparison. These targets are avaialble in in OpenGL 3.x shadow sampler variants. Changes are based on current SVN."

Location:

OpenSceneGraph/trunk

Files:

• include/osg/Texture (modified) (1 diff)
• src/osg/Texture.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/Texture

@@ -180 +180 @@
 #endif
 
+#ifndef GL_TEXTURE_CUBE_MAP
+    #define GL_TEXTURE_CUBE_MAP             0x8513
+    #define GL_TEXTURE_BINDING_CUBE_MAP     0x8514
+    #define GL_TEXTURE_CUBE_MAP_POSITIVE_X  0x8515
+    #define GL_TEXTURE_CUBE_MAP_NEGATIVE_X  0x8516
+    #define GL_TEXTURE_CUBE_MAP_POSITIVE_Y  0x8517
+    #define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y  0x8518
+    #define GL_TEXTURE_CUBE_MAP_POSITIVE_Z  0x8519
+    #define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z  0x851A
+    #define GL_PROXY_TEXTURE_CUBE_MAP       0x851B
+    #define GL_MAX_CUBE_MAP_TEXTURE_SIZE    0x851C
+#endif
+
 #ifndef GL_TEXTURE_BINDING_3D
     #define GL_TEXTURE_BINDING_3D             0x806A

OpenSceneGraph/trunk/src/osg/Texture.cpp

@@ -1627 +1627 @@
     }
 
-    // integer texture are not supported by the shadow
-    if (extensions->isShadowSupported() && (target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE) &&
+    // integer textures are not supported by the shadow
+    // GL_TEXTURE_1D_ARRAY_EXT could be included in the check below but its not yet implemented in OSG
+    if (extensions->isShadowSupported() && 
+        (target == GL_TEXTURE_2D || target == GL_TEXTURE_1D || target == GL_TEXTURE_RECTANGLE || target == GL_TEXTURE_CUBE_MAP || target == GL_TEXTURE_2D_ARRAY_EXT ) &&
         _internalFormatType != SIGNED_INTEGER && _internalFormatType != UNSIGNED_INTEGER)
     {