Changeset 18830 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Apr 7, 2009 3:44:27 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL-OSX: Do an additional check if we are initialized when we get messages from the Qt thread.

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.h (modified) (1 diff)
• renderspu_agl.c (modified) (1 diff)
• renderspu_init.c (modified) (10 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -224 +224 @@
     GLint currentBufferName;
     uint64_t uiDockUpdateTS;
+    bool fInit;
 #endif /* RT_OS_DARWIN */
 } RenderSPU;

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_agl.c

@@ -109 +109 @@
     UInt32      class = GetEventClass (event);
     UInt32      kind = GetEventKind (event);
+
+    /* If we aren't initialized or even deinitialized already (as on VM
+     * shutdown) do nothing. */
+    if (!render_spu.fInit)
+        return eventNotHandledErr;
 
     /* Fetch the sender of the event */

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -39 +39 @@
     crNetInit(NULL, NULL);
 
-    if (!crParseURL( render_spu.swap_master_url, protocol, hostname, 
+    if (!crParseURL( render_spu.swap_master_url, protocol, hostname,
                     &port, 9876))
         crError( "Bad URL: %s", render_spu.swap_master_url );
@@ -74 +74 @@
     (void) unused;
 
-    /* Force system to create the message queue. 
+    /* Force system to create the message queue.
      * Else, there's a chance that render spu will issue PostThreadMessage
      * before this thread calls GetMessage for first time.
@@ -102 +102 @@
 
                 *phWnd = CreateWindowEx(pCS->dwExStyle, pCS->lpszName, pCS->lpszClass, pCS->style,
-                                        pCS->x, pCS->y, pCS->cx, pCS->cy, 
+                                        pCS->x, pCS->y, pCS->cx, pCS->cy,
                                         pCS->hwndParent, pCS->hMenu, pCS->hInstance, &render_spu);
 
@@ -117 +117 @@
             else
             {
-                TranslateMessage(&msg); 
+                TranslateMessage(&msg);
                 DispatchMessage(&msg);
             }
@@ -239 +239 @@
                                     GetEventTypeCount(eventList), eventList,
                                     NULL, NULL);
+    render_spu.fInit = true;
 # endif /* !__LP64__ */
 #endif /* DARWIN */
@@ -269 +270 @@
     /*
      * Get the OpenGL extension functions.
-     * SIGH -- we have to wait until the very bitter end to load the 
+     * SIGH -- we have to wait until the very bitter end to load the
      * extensions, because the context has to be bound before
      * wglGetProcAddress will work correctly.  No such issue with GLX though.
@@ -285 +286 @@
      * but ARB for others. Need furthur testing here....
      */
-    render_spu.ws.wglGetExtensionsStringEXT = 
-        (wglGetExtensionsStringEXTFunc_t) 
+    render_spu.ws.wglGetExtensionsStringEXT =
+        (wglGetExtensionsStringEXTFunc_t)
         render_spu.ws.wglGetProcAddress( "wglGetExtensionsStringEXT" );
-    render_spu.ws.wglChoosePixelFormatEXT = 
+    render_spu.ws.wglChoosePixelFormatEXT =
         (wglChoosePixelFormatEXTFunc_t)
         render_spu.ws.wglGetProcAddress( "wglChoosePixelFormatARB" );
-    render_spu.ws.wglGetPixelFormatAttribivEXT = 
+    render_spu.ws.wglGetPixelFormatAttribivEXT =
         (wglGetPixelFormatAttribivEXTFunc_t)
         render_spu.ws.wglGetProcAddress( "wglGetPixelFormatAttribivARB" );
-    render_spu.ws.wglGetPixelFormatAttribfvEXT = 
+    render_spu.ws.wglGetPixelFormatAttribfvEXT =
         (wglGetPixelFormatAttribfvEXTFunc_t)
         render_spu.ws.wglGetProcAddress( "wglGetPixelFormatAttribfvARB" );
@@ -301 +302 @@
     {
         _cr_render_table[numFuncs].name = crStrdup("TexImage3D");
-        _cr_render_table[numFuncs].fn = (SPUGenericFunction) render_spu.ws.wglGetProcAddress("glTexImage3D");        
+        _cr_render_table[numFuncs].fn = (SPUGenericFunction) render_spu.ws.wglGetProcAddress("glTexImage3D");
         ++numFuncs;
         crDebug("Render SPU: Found glTexImage3D function");
@@ -361 +362 @@
 #ifdef RT_OS_DARWIN
 # ifndef __LP64__ /** @todo port to 64-bit darwin. */
+    render_spu.fInit = false;
     DisposeEventHandlerUPP(render_spu.hParentEventHandler);
     ReleaseWindowGroup(render_spu.pMasterGroup);
@@ -402 +404 @@
     *options = renderSPUOptions;
     *flags = (SPU_NO_PACKER|SPU_IS_TERMINAL|SPU_MAX_SERVERS_ZERO);
-    
+
     return 1;
 }