Changeset 22920 in vbox

Timestamp:

Sep 10, 2009 3:37:08 PM (15 years ago)

Author:

vboxsync

Message:

Video hw accel: fallback for PBO allocation failure

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Display/dd.c (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideoHGSMI.cpp (modified) (1 diff)
• src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (14 diffs)

trunk/include/VBox/VBoxVideo.h

@@ -585 +585 @@
         struct
         {
-            uint32_t ErrInfo;
+            int32_t ErrInfo;
         } out;
     } u;

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -816 +816 @@
             if(pCmd->rc == VINF_SUCCESS)
             {
+#ifdef DEBUGVHWASTRICT
                 Assert(!pBody->u.out.ErrInfo);
+#endif
                 if(pBody->u.out.ErrInfo)
                 {

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideoHGSMI.cpp

@@ -1258 +1258 @@
         if(pDispContext)
         {
+#ifdef DEBUGVHWASTRICT
             Assert(!pDispContext->bValid);
+#endif
             Assert(!pDispContext->pFirstCmd);
             Assert(!pDispContext->pLastCmd);

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -374 +374 @@
             }
 
-#ifdef DEBUG_misha
+#ifdef DEBUGVHWASTRICT
             /* guest usually completes commands in the order it receives it
              * if we're here this would typically means there is some cmd loss */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -783 +783 @@
     }
 
-#ifndef DEBUG_misha
+#ifndef DEBUGVHWASTRICT
     /* in case we do not support shaders & multitexturing we can not supprt dst colorkey,
      * no sense to report Video Acceleration supported */
@@ -1983 +1983 @@
 }
 
-#ifdef DEBUG_misha
+#ifdef DEBUGVHWASTRICT
 bool g_DbgTest = false;
 #endif
@@ -1989 +1989 @@
 void VBoxVHWATexture::doUpdate(uchar * pAddress, const QRect * pRect)
 {
-#ifdef DEBUG_misha
+#ifdef DEBUGVHWASTRICT
     if(g_DbgTest)
     {
@@ -2037 +2037 @@
             );
 
-#ifdef DEBUG_misha
+#ifdef DEBUGVHWASTRICT
     if(g_DbgTest)
     {
@@ -2203 +2203 @@
     vboxglBindBuffer(GL_PIXEL_UNPACK_BUFFER, mPBO);
 
-    GLvoid *buf = vboxglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
-
+    GLvoid *buf;
+
+    VBOXQGL_CHECKERR(
+            buf = vboxglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
+            );
+    Assert(buf);
+    if(buf)
+    {
 //    updateBuffer((uchar*)buf, pRect);
-    memcpy(buf, mAddress, memSize());
-
-    bool unmapped = vboxglUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
-    Assert(unmapped);
-
-    VBoxVHWATextureNP2Rect::doUpdate(0, &mRect);
-
-    vboxglBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+        memcpy(buf, mAddress, memSize());
+
+        bool unmapped;
+        VBOXQGL_CHECKERR(
+                unmapped = vboxglUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
+                );
+
+        Assert(unmapped);
+
+        VBoxVHWATextureNP2Rect::doUpdate(0, &mRect);
+
+        vboxglBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+    }
+    else
+    {
+        VBOXQGLLOGREL(("failed to map PBO, trying fallback to non-PBO approach\n"));
+        /* try fallback to non-PBO approach */
+        vboxglBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+        VBoxVHWATextureNP2Rect::doUpdate(pAddress, pRect);
+    }
 }
 
@@ -3177 +3195 @@
     {
         Assert(0);
-        pCmd->u.out.ErrInfo = 1;
+        pCmd->u.out.ErrInfo = -1;
+        return VINF_SUCCESS;
+    }
+
+    if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN)
+    {
+#ifdef DEBUGVHWASTRICT
+        Assert(0);
+#endif
+        pCmd->u.out.ErrInfo = -1;
         return VINF_SUCCESS;
     }
@@ -3187 +3214 @@
     }
 
-    if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN)
-    {
-#ifdef DEBUG_misha
-        Assert(0);
-#endif
-        pCmd->u.out.ErrInfo = 1;
-        return VINF_SUCCESS;
-    }
 
     Assert(/*pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN
@@ -3204 +3223 @@
         {
             Assert(0);
-            pCmd->u.out.ErrInfo = 1;
+            pCmd->u.out.ErrInfo = -1;
             return VINF_SUCCESS;
         }
@@ -3214 +3233 @@
             {
                 Assert(0);
-                pCmd->u.out.ErrInfo = 1;
+                pCmd->u.out.ErrInfo = -1;
                 return VINF_SUCCESS;
             }
@@ -3234 +3253 @@
             {
                 Assert(0);
-                pCmd->u.out.ErrInfo = 1;
+                pCmd->u.out.ErrInfo = -1;
                 return VINF_SUCCESS;
             }
@@ -3241 +3260 @@
         {
             Assert(0);
-            pCmd->u.out.ErrInfo = 1;
+            pCmd->u.out.ErrInfo = -1;
             return VINF_SUCCESS;
         }
@@ -3416 +3435 @@
 //            Assert(mbVGASurfCreated);
             mDisplay.getVGA()->getComplexList()->add(surf);
-#ifdef DEBUG_misha
+#ifdef DEBUGVHWASTRICT
             Assert(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_VISIBLE);
 #endif
@@ -3766 +3785 @@
         vboxCheckUpdateAddress (pDstSurf, pCmd->u.in.offDstSurface);
         VBOXQGLLOG(("pDstSurf (0x%x)\n",pDstSurf));
-#ifdef DEBUG_misha
+#ifdef DEBUGVHWASTRICT
         Assert(pDstSurf == mDisplay.getVGA());
         Assert(mDisplay.getVGA() == mDisplay.getPrimary());
@@ -3822 +3841 @@
     QPoint pos(pCmd->u.in.xPos, pCmd->u.in.yPos);
 
-#ifdef DEBUG_misha
+#ifdef DEBUGVHWASTRICT
     Assert(pDstSurf == mDisplay.getVGA());
     Assert(mDisplay.getVGA() == mDisplay.getPrimary());