Hi Tassilo, I have just done a quick review of your changes and they are more intrusive than I believe they need be. If the #define's are missing from the GL headers then what we normally do in the OSG to check whether the #define's existing and if not provide them. Following this principle I have adjusted the include/osg/GL2Extensions header to separately test for the problem #define thus:
svn diff Index: include/osg/GL2Extensions =================================================================== --- include/osg/GL2Extensions (revision 13102) +++ include/osg/GL2Extensions (working copy) @@ -129,7 +129,12 @@ #if !defined(GL_SAMPLER_1D) #define GL_SAMPLER_1D 0x8B5D +#endif +#if !defined(GL_SAMPLER_3D) #define GL_SAMPLER_3D 0x8B5F +#endif + +#if !defined(GL_SAMPLER_1D_SHADOW) #define GL_SAMPLER_1D_SHADOW 0x8B61 #define GL_SAMPLER_2D_SHADOW 0x8B62 #endif I have checked this modification in. Could you please test it out and let me know how you get on. Robert. _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
