Changeset 10456 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

Timestamp:

07/13/09 10:30:20 (4 years ago)

Author:

robert

Message:

From Stephan Huber, "ttached you'll find a small fix for the
GraphicsWindowCocoa?-implementation, which enhances multithreaded
stability, it ensures that modifications to the size of an openglcontext
is done only from one thread.
"

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

@@ -858 +858 @@
     _context = NULL;
     _window = NULL;
+    _updateContext = false;
     _valid = _initialized = true;
 }
@@ -1066 +1067 @@
 bool GraphicsWindowCocoa:: makeCurrentImplementation()
 {
+    if (_updateContext)
+    {
+        [_context update];
+        _updateContext = false; 
+    }
+    
     [_context makeCurrentContext];
     return true;
@@ -1206 +1213 @@
     GraphicsContext::resizedImplementation(x, y, width, height);
     
-    NSAutoreleasePool* localPool = [[NSAutoreleasePool alloc] init];
-   
-    if (_context)
-        [_context update];
+    _updateContext = true;
+    
     MenubarController::instance()->update();
     getEventQueue()->windowResize(x,y,width, height, getEventQueue()->getTime());
-    [localPool release];
 }