Changeset 8337 in vbox

Timestamp:

Apr 23, 2008 5:05:13 PM (17 years ago)

Author:

vboxsync

Message:

Fix check of seamless VRAM requirements. Avoided incorrect duplicate computation of required size and added rounding. Both qt3 and qt4 GUIs.

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/include/VBoxProblemReporter.h (modified) (1 diff)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxProblemReporter.cpp (modified) (2 diffs)
• VirtualBox4/include/VBoxProblemReporter.h (modified) (1 diff)
• VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• VirtualBox4/src/VBoxProblemReporter.cpp (modified) (2 diffs)

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

@@ -183 +183 @@
     void cannotFindMachineByName (const CVirtualBox &vbox, const QString &name);
 
-    void cannotEnterSeamlessMode (ULONG aWidth, ULONG aHeight, ULONG aBpp);
+    void cannotEnterSeamlessMode (ULONG aWidth, ULONG aHeight, ULONG aBpp, ULONG64 aMinVRAM);
 
     bool confirmMachineDeletion (const CMachine &machine);

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

@@ -1962 +1962 @@
         /* Check if the Guest Video RAM enough for the seamless mode. */
         QRect screen = QApplication::desktop()->screenGeometry (this);
-        ULONG64 availBits = (csession.GetMachine().GetVRAMSize() /* vram */
+        ULONG64 availBits = csession.GetMachine().GetVRAMSize() /* vram */
                           * _1M /* mb to bytes */
-                          - 4096 /* adapter info */
-                          - _1M /* current cache - may be changed in future */)
-                          / csession.GetMachine().GetMonitorCount()
                           * 8; /* to bits */
-        ULONG64 usedBits = screen.width() /* display width */
+        ULONG guestBpp = console->console().GetDisplay().GetBitsPerPixel();
+        ULONG64 usedBits = (screen.width() /* display width */
                          * screen.height() /* display height */
-                         * QColor::numBitPlanes(); /* bit per pixel */
+                         * guestBpp
+                         + _1M * 8) /* current cache per screen - may be changed in future */
+                         * csession.GetMachine().GetMonitorCount() /**< @todo fix assumption that all screens have same resolution */
+                         + 4096 * 8; /* adapter info */
         CGuest guest = console->console().GetGuest();
         ULONG maxWidth  = guest.GetMaxGuestWidth();
@@ -1981 +1982 @@
         {
             vboxProblem().cannotEnterSeamlessMode (screen.width(),
-                screen.height(), QColor::numBitPlanes());
+                screen.height(), guestBpp, (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
             return false;
         }

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

@@ -935 +935 @@
 void VBoxProblemReporter::cannotEnterSeamlessMode (ULONG aWidth,
                                                    ULONG aHeight,
-                                                   ULONG aBpp)
+                                                   ULONG aBpp,
+                                                   ULONG64 aMinVRAM)
 {
     message (&vboxGlobal().consoleWnd(), Error,
@@ -942 +943 @@
                  "<p>You should configure the VM to have at least <b>%1</b> "
                  "of video memory.</p>")
-             .arg (VBoxGlobal::formatSize ((ULONG64) (aWidth * aHeight *
-                                                      aBpp / 8 + _1M - 1))));
+             .arg (VBoxGlobal::formatSize (aMinVRAM)));
 }
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h

@@ -182 +182 @@
     void cannotFindMachineByName (const CVirtualBox &vbox, const QString &name);
 
-    void cannotEnterSeamlessMode (ULONG aWidth, ULONG aHeight, ULONG aBpp);
+    void cannotEnterSeamlessMode (ULONG aWidth, ULONG aHeight, ULONG aBpp, ULONG64 aMinVRAM);
 
     bool confirmMachineDeletion (const CMachine &machine);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -1985 +1985 @@
         /* Check if the Guest Video RAM enough for the seamless mode. */
         QRect screen = QApplication::desktop()->screenGeometry (this);
-        ULONG64 availBits = (csession.GetMachine().GetVRAMSize() /* vram */
+        ULONG64 availBits = csession.GetMachine().GetVRAMSize() /* vram */
                           * _1M /* mb to bytes */
-                          - 4096 /* adapter info */
-                          - _1M /* current cache - may be changed in future */)
-                          / csession.GetMachine().GetMonitorCount()
                           * 8; /* to bits */
-        ULONG64 usedBits = screen.width() /* display width */
+        ULONG guestBpp = console->console().GetDisplay().GetBitsPerPixel();
+        ULONG64 usedBits = (screen.width() /* display width */
                          * screen.height() /* display height */
-                         * depth(); /* bit per pixel */
+                         * guestBpp
+                         + _1M * 8) /* current cache per screen - may be changed in future */
+                         * csession.GetMachine().GetMonitorCount() /**< @todo fix assumption that all screens have same resolution */
+                         + 4096 * 8; /* adapter info */
         CGuest guest = console->console().GetGuest();
         ULONG maxWidth  = guest.GetMaxGuestWidth();
@@ -2004 +2005 @@
         {
             vboxProblem().cannotEnterSeamlessMode (screen.width(),
-                screen.height(), depth());
+                screen.height(), guestBpp, (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
             return false;
         }

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp

@@ -943 +943 @@
 void VBoxProblemReporter::cannotEnterSeamlessMode (ULONG aWidth,
                                                    ULONG aHeight,
-                                                   ULONG aBpp)
+                                                   ULONG aBpp,
+                                                   ULONG64 aMinVRAM)
 {
     message (&vboxGlobal().consoleWnd(), Error,
@@ -950 +951 @@
                  "<p>You should configure the VM to have at least <b>%1</b> "
                  "of video memory.</p>")
-             .arg (VBoxGlobal::formatSize ((ULONG64) (aWidth * aHeight *
-                                                      aBpp / 8 + _1M - 1))));
+             .arg (VBoxGlobal::formatSize (aMinVRAM)));
 }