Changeset 98670 in vbox

Timestamp:

Feb 21, 2023 11:47:35 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Rest of graphics adapter stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (2 diffs)
• UIMachine.h (modified) (1 diff)
• UIMachineView.cpp (modified) (5 diffs)
• UIMultiScreenLayout.cpp (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• scale/UIMachineViewScale.cpp (modified) (3 diffs)
• seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -386 +386 @@
     /* Remember 'desired' visibility status: */
     // See note in UIMachineView::sltHandleNotifyChange() regarding the graphics controller check. */
-    if (uisession()->machine().GetGraphicsAdapter().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA)
+    KGraphicsControllerType enmType = KGraphicsControllerType_Null;
+    acquireGraphicsControllerType(enmType);
+    if (enmType != KGraphicsControllerType_VMSVGA)
         gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, uiCommon().managedVMUuid());
 
@@ -432 +434 @@
     /* Remember last full-screen size: */
     m_monitorLastFullScreenSizeVector[(int)uScreenId] = size;
+}
+
+bool UIMachine::acquireGraphicsControllerType(KGraphicsControllerType &enmType)
+{
+    return uisession()->acquireGraphicsControllerType(enmType);
+}
+
+bool UIMachine::acquireVRAMSize(ulong &uSize)
+{
+    return uisession()->acquireVRAMSize(uSize);
+}
+
+bool UIMachine::acquireWhetherAccelerate3DEnabled(bool &fEnabled)
+{
+    return uisession()->acquireWhetherAccelerate3DEnabled(fEnabled);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -279 +279 @@
         void setGuestResizeIgnored(bool fIgnored) { m_fIsGuestResizeIgnored = fIgnored; }
 
+        /** Acquires graphics controller type. */
+        bool acquireGraphicsControllerType(KGraphicsControllerType &enmType);
+        /** Acquires VRAM size. */
+        bool acquireVRAMSize(ulong &uSize);
+        /** Acquires whether accelerate 3D is enabled. */
+        bool acquireWhetherAccelerate3DEnabled(bool &fEnabled);
         /** Acquires monitor count. */
         bool acquireMonitorCount(ulong &uCount);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -237 +237 @@
 
     /* Propagate the scale-factor related attributes to 3D service if necessary: */
-    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
+    bool fAccelerate3DEnabled = false;
+    uimachine()->acquireWhetherAccelerate3DEnabled(fAccelerate3DEnabled);
+    if (fAccelerate3DEnabled)
     {
         double dScaleFactorFor3D = dScaleFactor;
@@ -672 +674 @@
     uimachine()->invalidateAndUpdateScreen(m_uScreenId);
 
+    /* Acquire graphics controller type: */
+    KGraphicsControllerType enmType = KGraphicsControllerType_Null;
+    uimachine()->acquireGraphicsControllerType(enmType);
+
     /* If we are in normal or scaled mode and if GA are active,
      * remember the guest-screen size to be able to restore it when necessary: */
@@ -680 +686 @@
     if (   !isFullscreenOrSeamless()
         && uimachine()->isGuestSupportsGraphics()
-        && (machine().GetGraphicsAdapter().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA))
+        && (enmType != KGraphicsControllerType_VMSVGA))
         setStoredGuestScreenSizeHint(frameBufferSizeNew);
 
@@ -990 +996 @@
 
     /* Propagate the scale-factor related attributes to 3D service if necessary: */
-    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
+    bool fAccelerate3DEnabled = false;
+    uimachine()->acquireWhetherAccelerate3DEnabled(fAccelerate3DEnabled);
+    if (fAccelerate3DEnabled)
     {
         double dScaleFactorFor3D = dScaleFactor;
@@ -1222 +1230 @@
 
         /* Propagate the scale-factor related attributes to 3D service if necessary: */
-        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
+        bool fAccelerate3DEnabled = false;
+        uimachine()->acquireWhetherAccelerate3DEnabled(fAccelerate3DEnabled);
+        if (fAccelerate3DEnabled)
         {
             double dScaleFactorFor3D = dScaleFactor;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp

@@ -35 +35 @@
 #include "UIMessageCenter.h"
 #include "UIMultiScreenLayout.h"
-
-/* COM includes: */
-#include "COMEnums.h"
-#include "CMachine.h"
-#include "CGraphicsAdapter.h"
 
 
@@ -225 +220 @@
     if (uimachine()->isGuestSupportsGraphics())
     {
-        quint64 uAvailBits = machineLogic()->machine().GetGraphicsAdapter().GetVRAMSize() * _1M * 8;
-        quint64 uUsedBits = memoryRequirements(tmpMap);
+        ulong uVRAMSize = 0;
+        uimachine()->acquireVRAMSize(uVRAMSize);
+        const quint64 uAvailBits = uVRAMSize * _1M * 8;
+        const quint64 uUsedBits = memoryRequirements(tmpMap);
         fSuccess = uAvailBits >= uUsedBits;
         if (!fSuccess)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -625 +625 @@
 }
 
+bool UISession::acquireGraphicsControllerType(KGraphicsControllerType &enmType)
+{
+    CMachine comMachine = machine();
+    CGraphicsAdapter comAdapter = comMachine.GetGraphicsAdapter();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        const KGraphicsControllerType enmControllerType = comAdapter.GetGraphicsControllerType();
+        fSuccess = comAdapter.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireGraphicsAdapterParameter(comAdapter);
+        else
+            enmType = enmControllerType;
+    }
+    return fSuccess;
+}
+
+bool UISession::acquireVRAMSize(ulong &uSize)
+{
+    CMachine comMachine = machine();
+    CGraphicsAdapter comAdapter = comMachine.GetGraphicsAdapter();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        const ULONG uVRAMSize = comAdapter.GetVRAMSize();
+        fSuccess = comAdapter.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireGraphicsAdapterParameter(comAdapter);
+        else
+            uSize = uVRAMSize;
+    }
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherAccelerate3DEnabled(bool &fEnabled)
+{
+    CMachine comMachine = machine();
+    CGraphicsAdapter comAdapter = comMachine.GetGraphicsAdapter();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        const BOOL fAccelerate3DEnabeld = comAdapter.GetAccelerate3DEnabled();
+        fSuccess = comAdapter.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireGraphicsAdapterParameter(comAdapter);
+        else
+            fEnabled = fAccelerate3DEnabeld;
+    }
+    return fSuccess;
+}
+
 bool UISession::acquireMonitorCount(ulong &uCount)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -326 +326 @@
         QSize frameBufferSize(ulong uScreenId) const;
 
+        /** Acquires graphics controller type. */
+        bool acquireGraphicsControllerType(KGraphicsControllerType &enmType);
+        /** Acquires VRAM size. */
+        bool acquireVRAMSize(ulong &uSize);
+        /** Acquires whether accelerate 3D is enabled. */
+        bool acquireWhetherAccelerate3DEnabled(bool &fEnabled);
         /** Acquires monitor count. */
         bool acquireMonitorCount(ulong &uCount);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -84 +84 @@
     if (uimachine()->isGuestSupportsGraphics())
     {
-        quint64 availBits = machine().GetGraphicsAdapter().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
-        quint64 usedBits = m_pScreenLayout->memoryRequirements();
-        if (availBits < usedBits)
-        {
-            if (!msgCenter().cannotEnterFullscreenMode(0, 0, 0, (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M))
+        ulong uVRAMSize = 0;
+        uimachine()->acquireVRAMSize(uVRAMSize);
+        quint64 uAvailBits = uVRAMSize * _1M /* MiB to bytes */ * 8 /* to bits */;
+        quint64 uUsedBits = m_pScreenLayout->memoryRequirements();
+        if (uAvailBits < uUsedBits)
+        {
+            if (!msgCenter().cannotEnterFullscreenMode(0, 0, 0, (((uUsedBits + 7) / 8 + _1M - 1) / _1M) * _1M))
                 return false;
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -70 +70 @@
     {
         /* Propagate scale-factor to 3D service if necessary: */
-        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
+        bool fAccelerate3DEnabled = false;
+        uimachine()->acquireWhetherAccelerate3DEnabled(fAccelerate3DEnabled);
+        if (fAccelerate3DEnabled)
         {
             double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
@@ -129 +131 @@
     {
         /* Propagate scale-factor to 3D service if necessary: */
-        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
+        bool fAccelerate3DEnabled = false;
+        uimachine()->acquireWhetherAccelerate3DEnabled(fAccelerate3DEnabled);
+        if (fAccelerate3DEnabled)
         {
             double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
@@ -152 +156 @@
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
     /* Propagate unscaled-hidpi-output feature to 3D service if necessary: */
-    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
+    bool fAccelerate3DEnabled = false;
+    uimachine()->acquireWhetherAccelerate3DEnabled(fAccelerate3DEnabled);
+    if (fAccelerate3DEnabled)
         uimachine()->notifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -81 +81 @@
     if (uimachine()->isGuestSupportsSeamless())
     {
-        quint64 availBits = machine().GetGraphicsAdapter().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
-        quint64 usedBits = m_pScreenLayout->memoryRequirements();
-        if (availBits < usedBits)
+        ulong uVRAMSize = 0;
+        uimachine()->acquireVRAMSize(uVRAMSize);
+        quint64 uAvailBits = uVRAMSize * _1M /* MiB to bytes */ * 8 /* to bits */;
+        quint64 uUsedBits = m_pScreenLayout->memoryRequirements();
+        if (uAvailBits < uUsedBits)
         {
             msgCenter().cannotEnterSeamlessMode(0, 0, 0,
-                                                (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
+                                                (((uUsedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
             return false;
         }