Changeset 12309

Timestamp:

04/26/11 14:05:57 (2 years ago)

Author:

robert

Message:

From Craig Bosma,"Please find attached a fix for shared contexts on OS X, with the Cocoa backend. The NSOpenGLContext* _context member of GraphicsHandleCocoa? was never set on successfully creation, so even if the dynamic_cast to GraphicsHandleCocoa? succeeds, we get a bogus (NULL) pointer on retrieving the actual NSOpenGLContext* (line 1013).

This should fix the problem, as well as cause GraphicsWindowCocoa? to report the correct name "GraphicsWindowCarbon?" -> "GraphicsWindowCocoa?".
"

Location:

OpenSceneGraph/trunk

Files:

• include/osgViewer/api/Cocoa/GraphicsWindowCocoa (modified) (1 diff)
• src/osgViewer/GraphicsWindowCocoa.mm (modified) (1 diff)

OpenSceneGraph/trunk/include/osgViewer/api/Cocoa/GraphicsWindowCocoa

@@ -86 +86 @@
         virtual bool isSameKindAs(const Object* object) const { return dynamic_cast<const GraphicsWindowCocoa*>(object)!=0; }
         virtual const char* libraryName() const { return "osgViewer"; }
-        virtual const char* className() const { return "GraphicsWindowCarbon"; }
+        virtual const char* className() const { return "GraphicsWindowCocoa"; }
 
         virtual bool valid() const { return _valid; }

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

@@ -1021 +1021 @@
         return false;
     }
+    
+    // set graphics handle for shared usage
+    setNSOpenGLContext(_context);
+    
     GraphicsWindowCocoaGLView* theView = [[ GraphicsWindowCocoaGLView alloc ] initWithFrame:[ _window frame ] ];
     [theView setAutoresizingMask:  (NSViewWidthSizable | NSViewHeightSizable) ];