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

Timestamp:

May 22, 2014 11:42:21 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: saved state fixes, misc fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

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

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

@@ -946 +946 @@
 }
 
-PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData )
-{
-    PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGet(window);
+PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData, bool fRedraw )
+{
+    PCR_BLITTER pBlitter = fRedraw ? window->pBlitter : renderspuVBoxPresentBlitterGet(window);
     if (pBlitter)
     {
@@ -1001 +1001 @@
 }
 
-void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData )
-{
-    PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGetAndEnter(window, i32MakeCurrentUserData);
+void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor,
+        const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData,
+        bool fRedraw )
+{
+    PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGetAndEnter(window, i32MakeCurrentUserData, fRedraw);
     if (!pBlitter)
         return;

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

@@ -418 +418 @@
 extern int renderspuVBoxCompositorTryAcquire(WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR **ppCompositor);
 extern void renderspuVBoxCompositorRelease( WindowInfo *window);
-extern void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData );
+extern void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor,
+        const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData,
+        bool fRedraw);
 extern PCR_BLITTER renderspuVBoxPresentBlitterGet( WindowInfo *window );
 void renderspuVBoxPresentBlitterCleanup( WindowInfo *window );
 extern int renderspuVBoxPresentBlitterEnter( PCR_BLITTER pBlitter, int32_t i32MakeCurrentUserData );
-extern PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData );
+extern PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData, bool fRedraw );
 extern PCR_BLITTER renderspuVBoxPresentBlitterEnsureCreated( WindowInfo *window, int32_t i32MakeCurrentUserData );
 void renderspuWindowTermBase( WindowInfo *window );

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

@@ -610 +610 @@
 void renderspu_SystemVBoxPresentComposition( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry )
 {
-    renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
+    renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
 }
 

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

@@ -584 +584 @@
                         if (pCompositor)
                         {
-                            renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 0);
+                            renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 0, true);
                             renderspuVBoxCompositorRelease(pWindow);
                         }
@@ -1981 +1981 @@
     if (RT_SUCCESS(rc))
     {
-        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
+        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
         renderspuVBoxCompositorRelease(window);
     }

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

@@ -446 +446 @@
                         pWindow->redraw_device_context = hDC;
 
-                        renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 1);
+                        renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 1, true);
 
                         bRc = EndPaint(pWindow->hWnd, &Paint);
@@ -1295 +1295 @@
     if (RT_SUCCESS(rc))
     {
-        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
+        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
         renderspuVBoxCompositorRelease(window);
     }