Changeset 22951 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 11, 2009 10:37:45 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52217

Message:

video hw accel: allow only primary and overlay surfaces

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (1 diff)
• src/VBoxFBOverlay.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

@@ -28 +28 @@
 #include <iprt/critsect.h>
 
+#define VBOXVHWA_ALLOW_PRIMARY_AND_OVERLAY_ONLY 1
+
 #ifdef DEBUG
 #include "iprt/stream.h"

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

@@ -3236 +3236 @@
         return VINF_SUCCESS;
     }
-
+#ifdef VBOXVHWA_ALLOW_PRIMARY_AND_OVERLAY_ONLY
     if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN)
     {
@@ -3245 +3245 @@
         return VINF_SUCCESS;
     }
+#endif
 
     if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_PRIMARYSURFACE)
     {
-        pCmd->u.out.ErrInfo = 0;
+        if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_COMPLEX)
+        {
+#ifdef DEBUG_misha
+            Assert(0);
+#endif
+            pCmd->u.out.ErrInfo = -1;
+        }
+        else
+        {
+            pCmd->u.out.ErrInfo = 0;
+        }
         return VINF_SUCCESS;
     }
 
-
-    Assert(/*pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN
-            || */ pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OVERLAY);
+#ifdef VBOXVHWA_ALLOW_PRIMARY_AND_OVERLAY_ONLY
+    if((pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OVERLAY) == 0)
+    {
+#ifdef DEBUGVHWASTRICT
+        Assert(0);
+#endif
+        pCmd->u.out.ErrInfo = -1;
+        return VINF_SUCCESS;
+    }
+#endif
 
     if(pCmd->u.in.bIsDifferentPixelFormat)
@@ -3338 +3356 @@
     VBoxVHWASurfaceBase *surf = NULL;
 //    VBoxVHWAColorFormat *pFormat = NULL, Format;
+    bool bNoPBO = false;
     bool bPrimary = false;
 
@@ -3367 +3386 @@
     if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_PRIMARYSURFACE)
     {
+        bNoPBO = true;
         bPrimary = true;
         VBoxVHWASurfaceBase * pVga = vboxGetVGASurface();
 
-        if(pVga->handle() == VBOXVHWA_SURFHANDLE_INVALID)
+        Assert((pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN) == 0);
+        if(pVga->handle() == VBOXVHWA_SURFHANDLE_INVALID
+                && (pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN) == 0)
         {
             Assert(pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_RGB);
@@ -3403 +3425 @@
         }
     }
+    else if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN)
+    {
+        bNoPBO = true;
+    }
 
     if(!surf)
@@ -3421 +3447 @@
                         format,
                         pSrcBltCKey, pDstBltCKey, pSrcOverlayCKey, pDstOverlayCKey,
-                        bPrimary);
+                        bNoPBO);
         }
         else if(pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_FOURCC)
@@ -3436 +3462 @@
                                     format,
                                     pSrcBltCKey, pDstBltCKey, pSrcOverlayCKey, pDstOverlayCKey,
-                                    bPrimary);
+                                    bNoPBO);
         }
         else
@@ -3450 +3476 @@
         if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OVERLAY)
         {
-            Assert(!bPrimary);
+#ifdef DEBUG_misha
+            Assert(!bNoPBO);
+#endif
 
             if(!mConstructingList)
@@ -3466 +3494 @@
             }
         }
-        else if(bPrimary)
+        else
         {
             VBoxVHWASurfaceBase * pVga = vboxGetVGASurface();
@@ -3476 +3504 @@
             Assert(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_VISIBLE);
 #endif
-//            if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_VISIBLE)
+            if(bPrimary)
             {
                 Assert(surf->getComplexList() == mDisplay.getVGA()->getComplexList());
@@ -3482 +3510 @@
                 mDisplay.updateVGA(surf);
             }
-        }
-        else if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_COMPLEX)
-        {
-            //TODO: impl fullscreen mode support
-            Assert(0);
-        }
-        else
-        {
-            Assert(0);
         }
     }
@@ -3992 +4011 @@
         pCmd->u.out.surfaceCaps =
                             VBOXVHWA_SCAPS_PRIMARYSURFACE
-                    //        | VBOXVHWA_SCAPS_OFFSCREENPLAIN
+#ifndef VBOXVHWA_ALLOW_PRIMARY_AND_OVERLAY_ONLY
+                            | VBOXVHWA_SCAPS_OFFSCREENPLAIN
+#endif
                             | VBOXVHWA_SCAPS_FLIP
                             | VBOXVHWA_SCAPS_LOCALVIDMEM