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

Timestamp:

Mar 11, 2013 4:37:50 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL/win: fix redraw concurrency

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (6 diffs)
• renderspu.h (modified) (2 diffs)
• renderspu_agl.c (modified) (2 diffs)
• renderspu_cocoa.c (modified) (1 diff)
• renderspu_glx.c (modified) (4 diffs)
• renderspu_wgl.c (modified) (8 diffs)

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

@@ -769 +769 @@
 }
 
-int renderspuVBoxPresentBlitterEnter( PCR_BLITTER pBlitter )
+int renderspuVBoxPresentBlitterEnter( PCR_BLITTER pBlitter, int32_t i32MakeCurrentUserData)
 {
     int rc;
@@ -785 +785 @@
     }
 
+    CrBltSetMakeCurrentUserData(pBlitter, i32MakeCurrentUserData);
+
     rc = CrBltEnter(pBlitter, pCtxInfo, pWindowInfo);
     if (!RT_SUCCESS(rc))
@@ -794 +796 @@
 }
 
-PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window )
+PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData )
 {
     PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGet(window);
     if (pBlitter)
     {
-        int rc = renderspuVBoxPresentBlitterEnter(pBlitter);
+        int rc = renderspuVBoxPresentBlitterEnter(pBlitter, i32MakeCurrentUserData);
         if (RT_SUCCESS(rc))
         {
@@ -808 +810 @@
 }
 
-PCR_BLITTER renderspuVBoxPresentBlitterEnsureCreated( WindowInfo *window )
+PCR_BLITTER renderspuVBoxPresentBlitterEnsureCreated( WindowInfo *window, int32_t i32MakeCurrentUserData )
 {
     if (!window->pBlitter)
@@ -823 +825 @@
                 if (!CrBltIsEverEntered(pBlitter))
                 {
-                    int rc = renderspuVBoxPresentBlitterEnter(pBlitter);
+                    int rc = renderspuVBoxPresentBlitterEnter(pBlitter, i32MakeCurrentUserData);
                     if (RT_SUCCESS(rc))
                     {
@@ -849 +851 @@
 }
 
-void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR * pCompositor, struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry )
-{
-    PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGetAndEnter(window);
+void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR * pCompositor, struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData )
+{
+    PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGetAndEnter(window, i32MakeCurrentUserData);
     if (!pBlitter)
         return;

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

@@ -114 +114 @@
     HWND hWnd;
     HDC device_context;
+    HDC redraw_device_context;
     HRGN hRgn;
 #elif defined(DARWIN)
@@ -400 +401 @@
 extern int renderspuVBoxCompositorTryAcquire(WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR **ppCompositor);
 extern void renderspuVBoxCompositorRelease( WindowInfo *window);
-extern void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR * pCompositor, struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry );
+extern void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR * pCompositor, struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData );
 extern PCR_BLITTER renderspuVBoxPresentBlitterGet( WindowInfo *window );
 void renderspuVBoxPresentBlitterCleanup( WindowInfo *window );
-extern int renderspuVBoxPresentBlitterEnter( PCR_BLITTER pBlitter );
-extern PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window );
-extern PCR_BLITTER renderspuVBoxPresentBlitterEnsureCreated( WindowInfo *window );
+extern int renderspuVBoxPresentBlitterEnter( PCR_BLITTER pBlitter, int32_t i32MakeCurrentUserData );
+extern PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData );
+extern PCR_BLITTER renderspuVBoxPresentBlitterEnsureCreated( WindowInfo *window, int32_t i32MakeCurrentUserData );
 extern void renderspuWindowTerm( WindowInfo *window );
 extern GLboolean renderspuWindowInit( WindowInfo *window, VisualInfo *visual, GLboolean showIt, GLint id );

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

@@ -609 +609 @@
 void renderspu_SystemVBoxPresentComposition( WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR * pCompositor, struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry )
 {
-    renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry);
+    renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
 }
 
@@ -621 +621 @@
     CRASSERT(render_spu.ws.aglSetCurrentContext);
     //crDebug( "renderspu_SystemMakeCurrent( %x, %i, %x )", window, nativeWindow, context );
+
+    nativeWindow = 0;
 
     if(window && context)

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

@@ -162 +162 @@
 /*        printf ("visual mismatch .....................\n");*/
 
+    nativeWindow = 0;
+
     if (pWinInfo && pCtxInfo)
         cocoaViewMakeCurrentContext(pWinInfo->window, pCtxInfo->context);

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

@@ -584 +584 @@
                         if (pCompositor)
                         {
-                            renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL);
+                            renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 0);
                             renderspuVBoxCompositorRelease(pWindow);
                         }
@@ -1508 +1508 @@
     }
 #endif
+
+    nativeWindow = 0;
 
     if (window && context) {
@@ -1967 +1969 @@
     {
         Assert(pCurCompositor == pCompositor);
-        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry);
+        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
         renderspuVBoxCompositorRelease(window);
     }
@@ -1976 +1978 @@
         XEvent event;
         render_spu.self.Flush();
-        renderspuVBoxPresentBlitterEnsureCreated(window);
+        renderspuVBoxPresentBlitterEnsureCreated(window, 0);
 
         crMemset(&event, 0, sizeof (event));

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

@@ -436 +436 @@
                 if (pCompositor)
                 {
-                    HDC hDC, hOldDC = pWindow->device_context;
+                    HDC hDC;
                     PAINTSTRUCT Paint;
 
@@ -444 +444 @@
                     {
                         BOOL bRc;
-                        pWindow->device_context = hDC;
-
-                        renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL);
+                        pWindow->redraw_device_context = hDC;
+
+                        renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 1);
                         renderspuVBoxCompositorRelease(pWindow);
 
@@ -456 +456 @@
                         }
 
-                        pWindow->device_context = hOldDC;
+                        pWindow->redraw_device_context = NULL;
                     }
                     else
@@ -1258 +1258 @@
     {
         Assert(pCurCompositor == pCompositor);
-        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry);
+        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
         renderspuVBoxCompositorRelease(window);
     }
@@ -1265 +1265 @@
     {
         render_spu.self.Flush();
-        renderspuVBoxPresentBlitterEnsureCreated(window);
+        renderspuVBoxPresentBlitterEnsureCreated(window, 0);
         RedrawWindow(window->hWnd, NULL, NULL, RDW_INTERNALPAINT);
     }
@@ -1372 +1372 @@
         }
 
-        if (render_spu.render_to_app_window && nativeWindow)
+        if (0/*render_spu.render_to_app_window && nativeWindow*/)
         {
             /* The render_to_app_window option 
@@ -1413 +1413 @@
         {
             if (!context->hRC) {
+                CRASSERT(!nativeWindow);
                 if (context->shared)
                 {
@@ -1464 +1465 @@
 
             /*crDebug("MakeCurrent 0x%x, 0x%x", window->device_context, context->hRC);*/
-            if (!render_spu.ws.wglMakeCurrent(window->device_context, context->hRC))
+            if (!render_spu.ws.wglMakeCurrent(!nativeWindow ? window->device_context : window->redraw_device_context, context->hRC))
             {
                 DWORD err = GetLastError();