Changeset 3266

Timestamp:

08/13/04 12:46:04 (9 years ago)

Author:

robert

Message:

Fixes for OSX.

Location:

OpenSceneGraph/trunk

Files:

• include/osgFX/Registry (modified) (4 diffs)
• include/osgGL2/Extensions (modified) (1 diff)
• src/osgFX/Registry.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgFX/Registry

@@ -27 +27 @@
 {
 
-    class OSGFX_EXPORT Registry {
+    class OSGFX_EXPORT Registry : public osg::Referenced{
     public:
 
@@ -39 +39 @@
         typedef std::map<std::string, osg::ref_ptr<const Effect> > Effect_map;
 
-        inline static Registry *instance();
+        static Registry *instance();
 
         inline void registerEffect(const Effect *effect);
@@ -52 +52 @@
 
     private:
-        static Registry *instance_;
         Effect_map effects_;
     };
@@ -58 +57 @@
     // INLINE METHODS
 
-    inline Registry *Registry::instance()
-    {
-        if (!instance_) {
-            instance_ = new Registry;
-        }
-        return instance_;
-    }
+    
 
     inline const Registry::Effect_map &Registry::getEffectMap() const

OpenSceneGraph/trunk/include/osgGL2/Extensions

@@ -140 +140 @@
         bool isGlslSupported() const { return ( _isShaderObjectsSupported &&
                                                 _isVertexShaderSupported && 
-                                                _isFragmentShaderSupported && 
-                                                _isLanguage100Supported ); }
+                                                _isFragmentShaderSupported ); }
 
         void setShaderObjectsSupported(bool flag) { _isShaderObjectsSupported = flag; }

OpenSceneGraph/trunk/src/osgFX/Registry.cpp

@@ -3 +3 @@
 using namespace osgFX;
 
-Registry *Registry::instance_ = 0;
 
+Registry *Registry::instance()
+{
+    static osg::ref_ptr<Registry> s_instance = new Registry;
+    return s_instance.get();
+}
+    
 Registry::Registry()
 {