Changeset 44860 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

Timestamp:

Feb 28, 2013 10:48:15 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: redraw impl for X11/glx hosts; enable offscreen rendering for X11/glx hosts

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c (modified) (8 diffs)

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

@@ -80 +80 @@
 }
 
+GLboolean renderspuInitVisual(VisualInfo *pVisInfo, const char *displayName, GLbitfield visAttribs)
+{
+    pVisInfo->displayName = crStrdup(displayName);
+    pVisInfo->visAttribs = visAttribs;
+    return renderspu_SystemInitVisual(pVisInfo);
+}
 
 /*
@@ -117 +123 @@
     /* create a new visual */
     i = render_spu.numVisuals;
-    render_spu.visuals[i].displayName = crStrdup(displayName);
-    render_spu.visuals[i].visAttribs = visAttribs;
-    if (renderspu_SystemInitVisual(&(render_spu.visuals[i]))) {
+    if (renderspuInitVisual(&(render_spu.visuals[i]), displayName, visAttribs)) {
         render_spu.numVisuals++;
         return &(render_spu.visuals[i]);
@@ -315 +319 @@
 }
 
-
-/*
- * Window functions
- */
-
-GLint renderspuWindowCreateEx( const char *dpyName, GLint visBits, GLint id )
-{
-    WindowInfo *window;
-    VisualInfo *visual;
-    GLboolean showIt;
-
-    if (id <= 0)
-    {
-        id = (GLint)crHashtableAllocKeys(render_spu.windowTable, 1);
-        if (id <= 0)
-        {
-            crWarning("failed to allocate window id");
-            return -1;
-        }
-    }
-    else
-    {
-        if (crHashtableIsKeyUsed(render_spu.windowTable, id))
-        {
-            crWarning("the specified window key %d is in use", id);
-            return -1;
-        }
-    }
-
-
-    if (!dpyName || crStrlen(render_spu.display_string) > 0)
-        dpyName = render_spu.display_string;
-
-    visual = renderspuFindVisual( dpyName, visBits );
-    if (!visual)
-    {
-        crWarning( "Render SPU: Couldn't create a window, renderspuFindVisual returned NULL" );
-        return -1;
-    }
-
-    /* Allocate WindowInfo */
-    window = (WindowInfo *) crCalloc(sizeof(WindowInfo));
-    if (!window)
-    {
-        crWarning( "Render SPU: Couldn't create a window" );
-        return -1;
-    }
-
+GLboolean renderspuWindowInit( WindowInfo *window, VisualInfo *visual, GLboolean showIt, GLint id )
+{
     RTCritSectInit(&window->CompositorLock);
     window->pCompositor = NULL;
 
-    crHashtableAdd(render_spu.windowTable, id, window);
     window->BltInfo.Base.id = id;
 
@@ -373 +330 @@
     window->BltInfo.width  = render_spu.defaultWidth;
     window->BltInfo.height = render_spu.defaultHeight;
-
-    if (render_spu.force_hidden_wdn_create
-            || ((render_spu.render_to_app_window || render_spu.render_to_crut_window) && !crGetenv("CRNEWSERVER")))
-        showIt = 0;
-    else
-        showIt = window->BltInfo.Base.id != CR_RENDER_DEFAULT_WINDOW_ID;
 
     /* Set window->title, replacing %i with the window ID number */
@@ -399 +350 @@
         }
     }
-
+        
+    window->BltInfo.Base.visualBits = visual->visAttribs;
+    
+    
     /*
     crDebug("Render SPU: Creating window (visBits=0x%x, id=%d)", visBits, window->BltInfo.Base.id);
@@ -406 +360 @@
     if (!renderspu_SystemVBoxCreateWindow( visual, showIt, window ))
     {
+        crWarning( "Render SPU: Couldn't create a window, renderspu_SystemCreateWindow failed" );
+        return GL_FALSE;
+    }
+
+    CRASSERT(window->visual == visual);
+    return GL_TRUE;
+}
+
+/*
+ * Window functions
+ */
+
+GLint renderspuWindowCreateEx( const char *dpyName, GLint visBits, GLint id )
+{
+    WindowInfo *window;
+    VisualInfo *visual;
+    GLboolean showIt;
+
+    if (id <= 0)
+    {
+        id = (GLint)crHashtableAllocKeys(render_spu.windowTable, 1);
+        if (id <= 0)
+        {
+            crWarning("failed to allocate window id");
+            return -1;
+        }
+    }
+    else
+    {
+        if (crHashtableIsKeyUsed(render_spu.windowTable, id))
+        {
+            crWarning("the specified window key %d is in use", id);
+            return -1;
+        }
+    }
+
+
+    if (!dpyName || crStrlen(render_spu.display_string) > 0)
+        dpyName = render_spu.display_string;
+
+    visual = renderspuFindVisual( dpyName, visBits );
+    if (!visual)
+    {
+        crWarning( "Render SPU: Couldn't create a window, renderspuFindVisual returned NULL" );
+        return -1;
+    }
+
+    /* Allocate WindowInfo */
+    window = (WindowInfo *) crCalloc(sizeof(WindowInfo));
+    if (!window)
+    {
+        crWarning( "Render SPU: Couldn't create a window" );
+        return -1;
+    }
+    
+    crHashtableAdd(render_spu.windowTable, id, window);
+
+    if (render_spu.force_hidden_wdn_create
+            || ((render_spu.render_to_app_window || render_spu.render_to_crut_window) && !crGetenv("CRNEWSERVER")))
+        showIt = 0;
+    else
+        showIt = window->BltInfo.Base.id != CR_RENDER_DEFAULT_WINDOW_ID;
+
+
+    /*
+    crDebug("Render SPU: Creating window (visBits=0x%x, id=%d)", visBits, window->BltInfo.Base.id);
+    */
+    /* Have GLX/WGL/AGL create the window */
+    if (!renderspuWindowInit( window, visual, showIt, id ))
+    {
         crFree(window);
         crWarning( "Render SPU: Couldn't create a window, renderspu_SystemCreateWindow failed" );
         return -1;
     }
-
-    CRASSERT(window->visual == visual);
-
-    window->BltInfo.Base.visualBits = visual->visAttribs;
-
+    
     return window->BltInfo.Base.id;
 }
@@ -437 +457 @@
 }
 
+void renderspuWindowTerm( WindowInfo *window )
+{
+    GET_CONTEXT(pOldCtx);
+    /* ensure no concurrent draws can take place */
+    renderspuVBoxCompositorSet(window, NULL);
+    renderspu_SystemDestroyWindow( window );
+    RTCritSectDelete(&window->CompositorLock);
+    /* check if this window is bound to some ctx. Note: window pointer is already freed here */
+    crHashtableWalk(render_spu.contextTable, renderspuCheckCurrentCtxWindowCB, window);
+    /* restore current context */
+    {
+        GET_CONTEXT(pNewCtx);
+        if (pNewCtx!=pOldCtx)
+        {
+            renderspuMakeCurrent(pOldCtx&&pOldCtx->currentWindow ? pOldCtx->currentWindow->BltInfo.Base.id:CR_RENDER_DEFAULT_WINDOW_ID, 0,
+                                     pOldCtx ? pOldCtx->BltInfo.Base.id:CR_RENDER_DEFAULT_CONTEXT_ID);
+        }
+    }
+}
+
 void
 RENDER_APIENTRY renderspuWindowDestroy( GLint win )
 {
     WindowInfo *window;
-    GET_CONTEXT(pOldCtx);
 
     CRASSERT(win >= 0);
@@ -452 +491 @@
     if (window) {
         crDebug("Render SPU: Destroy window (%d)", win);
-        renderspu_SystemDestroyWindow( window );
-
-        RTCritSectDelete(&window->CompositorLock);
-        window->pCompositor = NULL;
+        renderspuWindowTerm( window );
 
         /* remove window info from hash table, and free it */
         crHashtableDelete(render_spu.windowTable, win, crFree);
 
-        /* check if this window is bound to some ctx. Note: window pointer is already freed here */
-        crHashtableWalk(render_spu.contextTable, renderspuCheckCurrentCtxWindowCB, window);
-
-        /* restore current context */
-        {
-            GET_CONTEXT(pNewCtx);
-            if (pNewCtx!=pOldCtx)
-            {
-                renderspuMakeCurrent(pOldCtx&&pOldCtx->currentWindow ? pOldCtx->currentWindow->BltInfo.Base.id:CR_RENDER_DEFAULT_WINDOW_ID, 0,
-                                     pOldCtx ? pOldCtx->BltInfo.Base.id:CR_RENDER_DEFAULT_CONTEXT_ID);
-            }
-        }
     }
     else {