Changeset 50944 in vbox for trunk/src/VBox

Timestamp:

Apr 1, 2014 1:53:32 PM (11 years ago)

Author:

vboxsync

Message:

wddm/crOpenGL: new command submission fixes

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp (modified) (2 diffs)
• GuestHost/OpenGL/include/cr_vreg.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp

@@ -914 +914 @@
 
     pCmd->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
+#ifdef DEBUG_misha
+    Assert(pCmd->u32FenceID == pVbva->u32FenceSubmitted + 1);
+#endif
     pVbva->u32FenceSubmitted = pCmd->u32FenceID;
 
@@ -1063 +1066 @@
         {
             if (u32FenceID)
+            {
+#ifdef DEBUG_misha
+                Assert(u32FenceID == pVbva->u32FenceCompleted + 1);
+#endif
                 pVbva->u32FenceCompleted = u32FenceID;
+            }
             enmDdiNotify = DXGK_INTERRUPT_DMA_COMPLETED;
         }

trunk/src/VBox/GuestHost/OpenGL/include/cr_vreg.h

@@ -88 +88 @@
     pRect1->xRight = RT_MIN(pRect1->xRight, pRect2->xRight);
     pRect1->yBottom = RT_MIN(pRect1->yBottom, pRect2->yBottom);
+    /* ensure the rect is valid */
+    pRect1->xRight = RT_MAX(pRect1->xRight, pRect1->xLeft);
+    pRect1->yBottom = RT_MAX(pRect1->yBottom, pRect1->yTop);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -4672 +4672 @@
             {
                 /* blit to primary from non-primary */
-                if (u8Flags & VBOXCMDVBVA_OPF_ALLOC_DSTID)
+                if (u8Flags & VBOXCMDVBVA_OPF_ALLOC_SRCID)
                 {
                     /* TexPresent */
                     uint32_t texId = pBlt->alloc.u.id;
+                    if (!texId)
+                    {
+                        WARN(("texId is NULL!\n"));
+                        return -1;
+                    }
 
                     crServerDispatchVBoxTexPresent(texId, u8PrimaryID, pBlt->Pos.x, pBlt->Pos.y, cRects, (const GLint*)pRects);