Changeset 27708 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Mar 25, 2010 2:36:56 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: some initial support for new multimonitor code

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (1 diff)
• renderspu.h (modified) (2 diffs)
• renderspu_glx.c (modified) (1 diff)
• renderspu_wgl.c (modified) (6 diffs)

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

@@ -1039 +1039 @@
 }
 
+DECLEXPORT(void) renderspuReparentWindow(GLint window)
+{
+    WindowInfo *pWindow;
+    CRASSERT(window >= 0);
+
+    pWindow = (WindowInfo *) crHashtableSearch(render_spu.windowTable, window);
+
+    if (!pWindow)
+    {
+        crDebug("Render SPU: Attempt to reparent invalid window (%d)", window);
+        return;
+    }
+
+#if defined(WINDOWS) || defined(GLX)
+    renderspu_SystemReparentWindow(pWindow);
+#endif
+}
 
 #if defined(DARWIN)

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

@@ -315 +315 @@
 extern void RENDER_APIENTRY renderspuSwapBuffers( GLint window, GLint flags );
 
+#if defined(WINDOWS) || defined(GLX)
+extern void renderspu_SystemReparentWindow(WindowInfo *window);
+#endif
+
 #ifdef __cplusplus
 extern "C" {
@@ -320 +324 @@
 DECLEXPORT(void) renderspuSetWindowId(uint64_t winId);
 DECLEXPORT(void) renderspuSetRootVisibleRegion(GLint cRects, GLint *pRects);
+DECLEXPORT(void) renderspuReparentWindow(GLint window);
 #ifdef __cplusplus
 }

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

@@ -1673 +1673 @@
     }
 }
+
+void renderspu_SystemReparentWindow(WindowInfo *window)
+{
+    Window parent;
+
+    parent = render_spu_parent_window_id>0 ? render_spu_parent_window_id : 
+                                             RootWindow(window->visual->dpy, window->visual->visual->screen);
+
+    XReparentWindow(window->visual->dpy, window->window, parent, window->x, window->y);
+}

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

@@ -84 +84 @@
             crWarning( "Render SPU: caught WM_CLOSE -- quitting." );
             exit( 0 );
+            break;
+
+        case WM_DESTROY:
+            crDebug( "Render SPU: caught WM_DESTROY for our window" );
             break;
 
@@ -480 +484 @@
         /* NO ERROR CODE FOR SHOWWINDOW */
         crDebug( "Render SPU: Showing the window" );
+        crDebug("renderspu_SystemCreateWindow: showwindow: %x", window->hWnd);
         ShowWindow( window->hWnd, SW_SHOWNORMAL );
     }
@@ -724 +729 @@
         /* NO ERROR CODE FOR SHOWWINDOW */
         crDebug( "Render SPU: Showing the window" );
+        crDebug("renderspu_SystemVBoxCreateWindow: showwindow: %x", window->hWnd);
         ShowWindow( window->hWnd, SW_SHOWNORMAL );
     }
@@ -758 +764 @@
 {
     if (showIt)
+    {
+        crDebug("SHOW renderspu_SystemShowWindow: %x", window->hWnd);
         ShowWindow( window->hWnd, SW_SHOWNORMAL );
+    }
     else
+    {
+        crDebug("HIDE renderspu_SystemShowWindow: %x", window->hWnd);
         ShowWindow( window->hWnd, SW_HIDE );
+    }
 }
 
@@ -859 +871 @@
             }
 
+            crDebug("MakeCurrent 0x%x, 0x%x", window->device_context, context->hRC);
             if (!render_spu.ws.wglMakeCurrent(window->device_context, context->hRC))
             {
@@ -1044 +1057 @@
     }
 }
+
+void renderspu_SystemReparentWindow(WindowInfo *window)
+{
+    SetParent(window->hWnd, render_spu_parent_window_id);
+}