Changeset 27846 in vbox

Timestamp:

Mar 30, 2010 9:14:51 PM (15 years ago)

Author:

vboxsync

Message:

2d: additional fix to not-using-VRAM mode

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (6 diffs)
• VBoxFBOverlayCommon.h (modified) (1 diff)

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

@@ -2244 +2244 @@
 
         Assert((pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN) == 0);
+
+        reportedFormat = VBoxVHWAColorFormat(pCmd->SurfInfo.PixelFormat.c.rgbBitCount,
+                                    pCmd->SurfInfo.PixelFormat.m1.rgbRBitMask,
+                                    pCmd->SurfInfo.PixelFormat.m2.rgbGBitMask,
+                                    pCmd->SurfInfo.PixelFormat.m3.rgbBBitMask);
+
         if (pVga->handle() == VBOXVHWA_SURFHANDLE_INVALID
                 && (pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OFFSCREENPLAIN) == 0)
@@ -2255 +2261 @@
 //                        && pCmd->SurfInfo.height == pVga->height())
                 {
-                    reportedFormat = VBoxVHWAColorFormat(pCmd->SurfInfo.PixelFormat.c.rgbBitCount,
-                                                pCmd->SurfInfo.PixelFormat.m1.rgbRBitMask,
-                                                pCmd->SurfInfo.PixelFormat.m2.rgbGBitMask,
-                                                pCmd->SurfInfo.PixelFormat.m3.rgbBBitMask);
                     // the assert below is incorrect in case the Framebuffer is working in "not using VRAM" mode
 //                    Assert(pVga->pixelFormat().equals(format));
@@ -2286 +2288 @@
     if(!surf)
     {
-        Assert(!(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_PRIMARYSURFACE));
         VBOXVHWAIMG_TYPE fFlags = 0;
         if(!bNoPBO)
@@ -2295 +2296 @@
         }
 
-        if(pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_RGB)
-        {
-            VBoxVHWAColorFormat format(pCmd->SurfInfo.PixelFormat.c.rgbBitCount,
+        QSize surfSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height);
+        QRect primaryRect = mDisplay.getPrimary()->rect();
+        VBoxVHWAColorFormat format;
+        if (bPrimary)
+            format = mDisplay.getVGA()->pixelFormat();
+        else if (pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_RGB)
+            format = VBoxVHWAColorFormat(pCmd->SurfInfo.PixelFormat.c.rgbBitCount,
                                             pCmd->SurfInfo.PixelFormat.m1.rgbRBitMask,
                                             pCmd->SurfInfo.PixelFormat.m2.rgbGBitMask,
                                             pCmd->SurfInfo.PixelFormat.m3.rgbBBitMask);
-            QSize surfSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height);
-            QRect primaryRect = mDisplay.getPrimary()->rect();
+        else if (pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_FOURCC)
+            format = VBoxVHWAColorFormat(pCmd->SurfInfo.PixelFormat.fourCC);
+        else
+            AssertBreakpoint();
+
+        if (format.isValid())
+        {
             surf = new VBoxVHWASurfaceBase(this,
                         surfSize,
@@ -2315 +2325 @@
                         fFlags);
         }
-        else if(pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_FOURCC)
-        {
-            QSize surfSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height);
-            QRect primaryRect = mDisplay.getPrimary()->rect();
-
-            VBoxVHWAColorFormat format(pCmd->SurfInfo.PixelFormat.fourCC);
-            surf = new VBoxVHWASurfaceBase(this,
-                                    surfSize,
-                                    primaryRect,
-                                    QRect(0, 0, surfSize.width(), surfSize.height()),
-                                    mViewport,
-                                    format,
-                                    pSrcBltCKey, pDstBltCKey, pSrcOverlayCKey, pDstOverlayCKey,
-#ifdef VBOXVHWA_USE_TEXGROUP
-                                    0,
-#endif
-                                    fFlags);
-        }
         else
         {
-            Assert(0);
-            VBOXQGLLOG_EXIT(("pSurf (0x%x)\n",surf));
+            AssertBreakpoint();
+            VBOXQGLLOG_EXIT(("pSurf (0x%p)\n",surf));
             return VERR_GENERAL_FAILURE;
         }
@@ -2430 +2422 @@
     Assert(surf->handle() == handle);
 
-    VBOXQGLLOG_EXIT(("pSurf (0x%x)\n",surf));
+    VBOXQGLLOG_EXIT(("pSurf (0x%p)\n",surf));
 
     return VINF_SUCCESS;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlayCommon.h

@@ -31 +31 @@
 # define VBOXQGLLOGREL(_m) LogRel( _m )
 #endif
-#define VBOXQGLLOG_ENTER(_m)
+#define VBOXQGLLOG_ENTER(_m) do {}while(0)
 //do{VBOXQGLLOG(("==>[%s]:", __FUNCTION__)); VBOXQGLLOG(_m);}while(0)
-#define VBOXQGLLOG_EXIT(_m)
+#define VBOXQGLLOG_EXIT(_m) do {}while(0)
 //do{VBOXQGLLOG(("<==[%s]:", __FUNCTION__)); VBOXQGLLOG(_m);}while(0)
 #ifdef DEBUG