Changeset 81964 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 18, 2019 8:42:02 PM (5 years ago)

Author:

vboxsync

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

134761

Message:

Main/GraphicsAdapter: Split off a few attributes from Machine interface, which affects quite a few other interfaces.
Frontends/VirtualBox+VBoxManage+VBoxSDL+VBoxShell: Adapt accordingly.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageControlVM.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageInfo.cpp (modified) (3 diffs)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (7 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)
• VBoxShell/vboxshell.py (modified) (2 diffs)
• VirtualBox/src/globals/UIDetailsGenerator.cpp (modified) (6 diffs)
• VirtualBox/src/globals/UIMachineAttributeSetter.cpp (modified) (3 diffs)
• VirtualBox/src/runtime/UIIndicatorsPool.cpp (modified) (4 diffs)
• VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (2 diffs)
• VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (3 diffs)
• VirtualBox/src/runtime/UIMachineView.cpp (modified) (5 diffs)
• VirtualBox/src/runtime/UIMachineWindow.cpp (modified) (3 diffs)
• VirtualBox/src/runtime/UIMultiScreenLayout.cpp (modified) (2 diffs)
• VirtualBox/src/runtime/UISession.cpp (modified) (6 diffs)
• VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• VirtualBox/src/runtime/information/UIInformationRuntime.cpp (modified) (2 diffs)
• VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp (modified) (2 diffs)
• VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp (modified) (2 diffs)
• VirtualBox/src/runtime/scale/UIMachineViewScale.cpp (modified) (4 diffs)
• VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp (modified) (3 diffs)
• VirtualBox/src/settings/UISettingsDialogSpecific.cpp (modified) (3 diffs)
• VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (6 diffs)
• VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp (modified) (5 diffs)
• VirtualBox/src/snapshots/UISnapshotDetailsWidget.h (modified) (2 diffs)
• VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -1912 +1912 @@
             CHECK_ERROR_BREAK(recordingSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saRecordingScreenScreens)));
 
+            ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+            CHECK_ERROR_BREAK(sessionMachine, COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam()));
+
             /* Note: For now all screens have the same configuration. */
 
@@ -1929 +1932 @@
             {
                 ULONG cMonitors = 64;
-                CHECK_ERROR_BREAK(sessionMachine, COMGETTER(MonitorCount)(&cMonitors));
+                CHECK_ERROR_BREAK(pGraphicsAdapter, COMGETTER(MonitorCount)(&cMonitors));
                 com::SafeArray<BOOL> saScreens(cMonitors);
                 if (   a->argc == 4

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -723 +723 @@
     SHOW_ULONG_PROP(       machine, MemorySize,                 "memory",               "Memory size",      "MB");
     SHOW_BOOLEAN_PROP(     machine, PageFusionEnabled,          "pagefusion",           "Page Fusion:");
-    SHOW_ULONG_PROP(       machine, VRAMSize,                   "vram",                 "VRAM size:",        "MB");
+    ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+    machine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+    SHOW_ULONG_PROP(pGraphicsAdapter, VRAMSize,                 "vram",                 "VRAM size:",        "MB");
     SHOW_ULONG_PROP(       machine, CPUExecutionCap,            "cpuexecutioncap",      "CPU exec cap:",     "%");
     SHOW_BOOLEAN_PROP(     machine, HPETEnabled,                "hpet",                 "HPET:");
@@ -920 +922 @@
 
     GraphicsControllerType_T enmGraphics;
-    rc = machine->COMGETTER(GraphicsControllerType)(&enmGraphics);
+    rc = pGraphicsAdapter->COMGETTER(GraphicsControllerType)(&enmGraphics);
     if (SUCCEEDED(rc))
     {
@@ -962 +964 @@
     }
 
-    SHOW_ULONG_PROP(      machine,  MonitorCount,               "monitorcount",             "Monitor count:", "");
-    SHOW_BOOLEAN_PROP(    machine,  Accelerate3DEnabled,        "accelerate3d",             "3D Acceleration:");
+    SHOW_ULONG_PROP(pGraphicsAdapter, MonitorCount,             "monitorcount",             "Monitor count:", "");
+    SHOW_BOOLEAN_PROP(pGraphicsAdapter, Accelerate3DEnabled,    "accelerate3d",             "3D Acceleration:");
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    SHOW_BOOLEAN_PROP(    machine,  Accelerate2DVideoEnabled,   "accelerate2dvideo",        "2D Video Acceleration:");
+    SHOW_BOOLEAN_PROP(pGraphicsAdapter, Accelerate2DVideoEnabled, "accelerate2dvideo",      "2D Video Acceleration:");
 #endif
     SHOW_BOOLEAN_PROP(    machine,  TeleporterEnabled,          "teleporterenabled",        "Teleporter Enabled:");

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -558 +558 @@
     sessionMachine->COMGETTER(BIOSSettings)(biosSettings.asOutParam());
 
+    ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+    sessionMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+
     RTGETOPTSTATE GetOptState;
     RTGetOptInit(&GetOptState, a->argc, a->argv, g_aModifyVMOptions,
@@ -642 +645 @@
             case MODIFYVM_VRAM:
             {
-                CHECK_ERROR(sessionMachine, COMSETTER(VRAMSize)(ValueUnion.u32));
+                CHECK_ERROR(pGraphicsAdapter, COMSETTER(VRAMSize)(ValueUnion.u32));
                 break;
             }
@@ -892 +895 @@
                 if (   !RTStrICmp(ValueUnion.psz, "none")
                     || !RTStrICmp(ValueUnion.psz, "disabled"))
-                    CHECK_ERROR(sessionMachine, COMSETTER(GraphicsControllerType)(GraphicsControllerType_Null));
+                    CHECK_ERROR(pGraphicsAdapter, COMSETTER(GraphicsControllerType)(GraphicsControllerType_Null));
                 else if (   !RTStrICmp(ValueUnion.psz, "vboxvga")
                          || !RTStrICmp(ValueUnion.psz, "vbox")
                          || !RTStrICmp(ValueUnion.psz, "vga")
                          || !RTStrICmp(ValueUnion.psz, "vesa"))
-                    CHECK_ERROR(sessionMachine, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VBoxVGA));
+                    CHECK_ERROR(pGraphicsAdapter, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VBoxVGA));
 #ifdef VBOX_WITH_VMSVGA
                 else if (   !RTStrICmp(ValueUnion.psz, "vmsvga")
                          || !RTStrICmp(ValueUnion.psz, "vmware"))
-                    CHECK_ERROR(sessionMachine, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VMSVGA));
+                    CHECK_ERROR(pGraphicsAdapter, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VMSVGA));
                 else if (   !RTStrICmp(ValueUnion.psz, "vboxsvga")
                          || !RTStrICmp(ValueUnion.psz, "svga"))
-                    CHECK_ERROR(sessionMachine, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VBoxSVGA));
+                    CHECK_ERROR(pGraphicsAdapter, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VBoxSVGA));
 #endif
                 else
@@ -916 +919 @@
             case MODIFYVM_MONITORCOUNT:
             {
-                CHECK_ERROR(sessionMachine, COMSETTER(MonitorCount)(ValueUnion.u32));
+                CHECK_ERROR(pGraphicsAdapter, COMSETTER(MonitorCount)(ValueUnion.u32));
                 break;
             }
@@ -922 +925 @@
             case MODIFYVM_ACCELERATE3D:
             {
-                CHECK_ERROR(sessionMachine, COMSETTER(Accelerate3DEnabled)(ValueUnion.f));
+                CHECK_ERROR(pGraphicsAdapter, COMSETTER(Accelerate3DEnabled)(ValueUnion.f));
                 break;
             }
@@ -929 +932 @@
             case MODIFYVM_ACCELERATE2DVIDEO:
             {
-                CHECK_ERROR(sessionMachine, COMSETTER(Accelerate2DVideoEnabled)(ValueUnion.f));
+                CHECK_ERROR(pGraphicsAdapter, COMSETTER(Accelerate2DVideoEnabled)(ValueUnion.f));
                 break;
             }
@@ -3006 +3009 @@
                     {
                         ULONG cMonitors = 64;
-                        CHECK_ERROR(sessionMachine, COMGETTER(MonitorCount)(&cMonitors));
+                        CHECK_ERROR(pGraphicsAdapter, COMGETTER(MonitorCount)(&cMonitors));
                         com::SafeArray<BOOL> screens(cMonitors);
                         if (parseScreens(ValueUnion.psz, &screens))

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1457 +1457 @@
 
     ComPtr<IMachine> pMachine;
+    ComPtr<IGraphicsAdapter> pGraphicsAdapter;
 
     rc = pVirtualBoxClient.createInprocObject(CLSID_VirtualBoxClient);
@@ -1950 +1951 @@
     }
 
+    rc = gpMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+    if (rc != S_OK)
+    {
+        RTPrintf("Error: could not get graphics adapter object\n");
+        goto leave;
+    }
+
     if (vramSize)
     {
-        rc = gpMachine->COMSETTER(VRAMSize)(vramSize);
+        rc = pGraphicsAdapter->COMSETTER(VRAMSize)(vramSize);
         if (rc != S_OK)
         {
-            gpMachine->COMGETTER(VRAMSize)((ULONG*)&vramSize);
+            pGraphicsAdapter->COMGETTER(VRAMSize)((ULONG*)&vramSize);
             RTPrintf("Error: could not set VRAM size, using current setting of %d MBytes\n", vramSize);
         }
@@ -1976 +1984 @@
         goto leave;
 
-    gpMachine->COMGETTER(MonitorCount)(&gcMonitors);
+    pGraphicsAdapter->COMGETTER(MonitorCount)(&gcMonitors);
     if (gcMonitors > 64)
         gcMonitors = 64;

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -976 +976 @@
     print("  CPUs [CPUCount]: %d" % (mach.CPUCount))
     print("  RAM [memorySize]: %dM" % (mach.memorySize))
-    print("  VRAM [VRAMSize]: %dM" % (mach.VRAMSize))
-    print("  Monitors [monitorCount]: %d" % (mach.monitorCount))
+    print("  VRAM [VRAMSize]: %dM" % (mach.graphicsAdapter.VRAMSize))
+    print("  Monitors [monitorCount]: %d" % (mach.graphicsAdapter.monitorCount))
     print("  Chipset [chipsetType]: %s (%s)" % (asEnumElem(ctx, "ChipsetType", mach.chipsetType), mach.chipsetType))
     print()
@@ -996 +996 @@
     print("  Nested paging [guest win machine.setHWVirtExProperty(ctx[\\'const\\'].HWVirtExPropertyType_NestedPaging, value)]: " + asState(hwVirtNestedPaging))
 
-    print("  Hardware 3d acceleration [accelerate3DEnabled]: " + asState(mach.accelerate3DEnabled))
-    print("  Hardware 2d video acceleration [accelerate2DVideoEnabled]: " + asState(mach.accelerate2DVideoEnabled))
+    print("  Hardware 3d acceleration [accelerate3DEnabled]: " + asState(mach.graphicsAdapter.accelerate3DEnabled))
+    print("  Hardware 2d video acceleration [accelerate2DVideoEnabled]: " + asState(mach.graphicsAdapter.accelerate2DVideoEnabled))
 
     print("  Use universal time [RTCUseUTC]: %s" % (asState(mach.RTCUseUTC)))

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -30 +30 @@
 #include "COMEnums.h"
 #include "CAudioAdapter.h"
+#include "CGraphicsAdapter.h"
 #include "CMachine.h"
 #include "CMediumAttachment.h"
@@ -260 +261 @@
     }
 
+    const CGraphicsAdapter comGraphics = comMachine.GetGraphicsAdapter();
+
     /* Video memory: */
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRAM)
@@ -265 +268 @@
         /* Configure hovering anchor: */
         const QString strAnchorType = QString("video_memory");
-        const int iVideoMemory = comMachine.GetVRAMSize();
+        const int iVideoMemory = comGraphics.GetVRAMSize();
         table << UITextTableLine(QApplication::translate("UIDetails", "Video Memory", "details (display)"),
                                  QString("<a href=#%1,%2>%3</a>")
@@ -276 +279 @@
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScreenCount)
     {
-        const int cGuestScreens = comMachine.GetMonitorCount();
+        const int cGuestScreens = comGraphics.GetMonitorCount();
         if (cGuestScreens > 1)
             table << UITextTableLine(QApplication::translate("UIDetails", "Screens", "details (display)"),
@@ -304 +307 @@
     {
         const QString strAnchorType = QString("graphics_controller_type");
-        const KGraphicsControllerType enmType = comMachine.GetGraphicsControllerType();
+        const KGraphicsControllerType enmType = comGraphics.GetGraphicsControllerType();
         table << UITextTableLine(QApplication::translate("UIDetails", "Graphics Controller", "details (display)"),
                                  QString("<a href=#%1,%2>%3</a>")
@@ -318 +321 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
         /* 2D acceleration: */
-        if (comMachine.GetAccelerate2DVideoEnabled())
+        if (comGraphics.GetAccelerate2DVideoEnabled())
             acceleration << QApplication::translate("UIDetails", "2D Video", "details (display)");
 #endif
         /* 3D acceleration: */
-        if (comMachine.GetAccelerate3DEnabled())
+        if (comGraphics.GetAccelerate3DEnabled())
             acceleration << QApplication::translate("UIDetails", "3D", "details (display)");
         if (!acceleration.isEmpty())

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMachineAttributeSetter.cpp

@@ -27 +27 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
+#include "CGraphicsAdapter.h"
 #include "CNetworkAdapter.h"
 #include "CUSBController.h"
@@ -159 +160 @@
             {
                 /* Change machine video memory (VRAM): */
-                comMachine.SetVRAMSize(guiAttribute.toInt());
+                comMachine.GetGraphicsAdapter().SetVRAMSize(guiAttribute.toInt());
                 if (!comMachine.isOk())
                 {
@@ -170 +171 @@
             {
                 /* Change machine graphics controller type: */
-                comMachine.SetGraphicsControllerType(guiAttribute.value<KGraphicsControllerType>());
+                comMachine.GetGraphicsAdapter().SetGraphicsControllerType(guiAttribute.value<KGraphicsControllerType>());
                 if (!comMachine.isOk())
                 {

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

@@ -39 +39 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
+#include "CGraphicsAdapter.h"
 #include "CRecordingSettings.h"
 #include "CRecordingScreenSettings.h"
@@ -742 +743 @@
         QString strFullData;
 
+        CGraphicsAdapter comGraphics = machine.GetGraphicsAdapter();
         /* Video Memory: */
-        const ULONG uVRAMSize = machine.GetVRAMSize();
+        const ULONG uVRAMSize = comGraphics.GetVRAMSize();
         const QString strVRAMSize = UICommon::tr("<nobr>%1 MB</nobr>", "details report").arg(uVRAMSize);
         strFullData += s_strTableRow2
@@ -749 +751 @@
 
         /* Monitor Count: */
-        const ULONG uMonitorCount = machine.GetMonitorCount();
+        const ULONG uMonitorCount = comGraphics.GetMonitorCount();
         if (uMonitorCount > 1)
         {
@@ -758 +760 @@
 
         /* 3D acceleration: */
-        const bool fAcceleration3D = machine.GetAccelerate3DEnabled() && uiCommon().is3DAvailable();
+        const bool fAcceleration3D = comGraphics.GetAccelerate3DEnabled() && uiCommon().is3DAvailable();
         if (fAcceleration3D)
         {

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

@@ -68 +68 @@
 /* COM includes: */
 #include "CKeyboard.h"
+#include "CGraphicsAdapter.h"
 
 /* Other VBox includes: */
@@ -1014 +1015 @@
     ::memset(m_pressedKeys, 0, sizeof(m_pressedKeys));
 
-    m_cMonitors = uisession()->machine().GetMonitorCount();
+    m_cMonitors = uisession()->machine().GetGraphicsAdapter().GetMonitorCount();
 }
 

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

@@ -72 +72 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
+#include "CGraphicsAdapter.h"
 #include "CRecordingSettings.h"
 #include "CVirtualBoxErrorInfo.h"
@@ -1840 +1841 @@
     /* TODO_NEW_CORE: On reset the additional screens didn't get a display
        update. Emulate this for now until it get fixed. */
-    ulong uMonitorCount = machine().GetMonitorCount();
+    ulong uMonitorCount = machine().GetGraphicsAdapter().GetMonitorCount();
     for (ulong uScreenId = 1; uScreenId < uMonitorCount; ++uScreenId)
         machineWindows().at(uScreenId)->update();
@@ -3121 +3122 @@
 {
     /* Get console: */
-    const int cGuestScreens = machine().GetMonitorCount();
+    const int cGuestScreens = machine().GetGraphicsAdapter().GetMonitorCount();
     QList<QImage> images;
     ULONG uMaxWidth  = 0;

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

@@ -55 +55 @@
 #include "CConsole.h"
 #include "CDisplay.h"
+#include "CGraphicsAdapter.h"
 #include "CSession.h"
 #include "CFramebuffer.h"
@@ -243 +244 @@
 
     /* Propagate the scale-factor related attributes to 3D service if necessary: */
-    if (machine().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
     {
         double dScaleFactorFor3D = dScaleFactor;
@@ -426 +427 @@
     if (   !isFullscreenOrSeamless()
         && uisession()->isGuestSupportsGraphics()
-        && (machine().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA))
+        && (machine().GetGraphicsAdapter().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA))
         storeGuestSizeHint(QSize(iWidth, iHeight));
 
@@ -519 +520 @@
 
     /* Propagate the scale-factor related attributes to 3D service if necessary: */
-    if (machine().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
     {
         double dScaleFactorFor3D = dScaleFactor;
@@ -715 +716 @@
 
         /* Propagate the scale-factor related attributes to 3D service if necessary: */
-        if (machine().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
         {
             double dScaleFactorFor3D = dScaleFactor;

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

@@ -44 +44 @@
 /* COM includes: */
 #include "CConsole.h"
+#include "CGraphicsAdapter.h"
 #include "CSnapshot.h"
 
@@ -495 +496 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     /* Need to force the QGL framebuffer in case 2D Video Acceleration is supported & enabled: */
-    bool bAccelerate2DVideo = machine().GetAccelerate2DVideoEnabled() && VBox2DHelpers::isAcceleration2DVideoAvailable();
+    bool bAccelerate2DVideo = machine().GetGraphicsAdapter().GetAccelerate2DVideoEnabled() && VBox2DHelpers::isAcceleration2DVideoAvailable();
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
@@ -573 +574 @@
         strMachineName += " - " + (strUserProductName.isEmpty() ? defaultWindowTitle() : strUserProductName);
 #endif /* !VBOX_WS_MAC */
-        if (machine().GetMonitorCount() > 1)
+        if (machine().GetGraphicsAdapter().GetMonitorCount() > 1)
             strMachineName += QString(" : %1").arg(m_uScreenId + 1);
         setWindowTitle(strMachineName);

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

@@ -38 +38 @@
 #include "CMachine.h"
 #include "CDisplay.h"
+#include "CGraphicsAdapter.h"
 
 
 UIMultiScreenLayout::UIMultiScreenLayout(UIMachineLogic *pMachineLogic)
     : m_pMachineLogic(pMachineLogic)
-    , m_cGuestScreens(m_pMachineLogic->machine().GetMonitorCount())
+    , m_cGuestScreens(m_pMachineLogic->machine().GetGraphicsAdapter().GetMonitorCount())
     , m_cHostScreens(0)
 {
@@ -227 +228 @@
     if (m_pMachineLogic->uisession()->isGuestSupportsGraphics())
     {
-        quint64 availBits = m_pMachineLogic->machine().GetVRAMSize() * _1M * 8;
+        quint64 availBits = m_pMachineLogic->machine().GetGraphicsAdapter().GetVRAMSize() * _1M * 8;
         quint64 usedBits = memoryRequirements(tmpMap);
         fSuccess = availBits >= usedBits;

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

@@ -63 +63 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
+#include "CGraphicsAdapter.h"
 #include "CRecordingSettings.h"
 #include "CSystemProperties.h"
@@ -246 +247 @@
     /* Log whether 2D video acceleration is enabled: */
     LogRel(("GUI: 2D video acceleration is %s\n",
-           machine().GetAccelerate2DVideoEnabled() && VBox2DHelpers::isAcceleration2DVideoAvailable()
+           machine().GetGraphicsAdapter().GetAccelerate2DVideoEnabled() && VBox2DHelpers::isAcceleration2DVideoAvailable()
            ? "enabled" : "disabled"));
 #endif /* VBOX_WITH_VIDEOHWACCEL */
@@ -1224 +1225 @@
 
     /* Prepare initial screen visibility status: */
-    m_monitorVisibilityVector.resize(machine().GetMonitorCount());
+    m_monitorVisibilityVector.resize(machine().GetGraphicsAdapter().GetMonitorCount());
     m_monitorVisibilityVector.fill(false);
     m_monitorVisibilityVector[0] = true;
 
     /* Prepare empty last full-screen size vector: */
-    m_monitorLastFullScreenSizeVector.resize(machine().GetMonitorCount());
+    m_monitorLastFullScreenSizeVector.resize(machine().GetGraphicsAdapter().GetMonitorCount());
     m_monitorLastFullScreenSizeVector.fill(QSize(-1, -1));
 
@@ -1269 +1270 @@
 
     /* Prepare initial screen visibility status of host-desires (same as facts): */
-    m_monitorVisibilityVectorHostDesires.resize(machine().GetMonitorCount());
+    m_monitorVisibilityVectorHostDesires.resize(machine().GetGraphicsAdapter().GetMonitorCount());
     for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
         m_monitorVisibilityVectorHostDesires[iScreenIndex] = m_monitorVisibilityVector[iScreenIndex];
@@ -1281 +1282 @@
 {
     /* Each framebuffer will be really prepared on first UIMachineView creation: */
-    m_frameBufferVector.resize(machine().GetMonitorCount());
+    m_frameBufferVector.resize(machine().GetGraphicsAdapter().GetMonitorCount());
 
     /* Make sure action-pool knows guest-screen count: */
@@ -2195 +2196 @@
     /* Remember 'desired' visibility status: */
     /* See note in UIMachineView::sltHandleNotifyChange() regarding the graphics controller check. */
-    if (machine().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA)
+    if (machine().GetGraphicsAdapter().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA)
         gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, uiCommon().managedVMUuid());
 

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

@@ -39 +39 @@
 #endif /* VBOX_WS_MAC */
 
+/* COM includes: */
+#include "CGraphicsAdapter.h"
+
 
 UIMachineLogicFullscreen::UIMachineLogicFullscreen(QObject *pParent, UISession *pSession)
@@ -62 +65 @@
     if (uisession()->isGuestSupportsGraphics())
     {
-        quint64 availBits = machine().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
+        quint64 availBits = machine().GetGraphicsAdapter().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
         quint64 usedBits = m_pScreenLayout->memoryRequirements();
         if (availBits < usedBits)
@@ -527 +530 @@
 
     /* Create machine-window(s): */
-    for (uint cScreenId = 0; cScreenId < machine().GetMonitorCount(); ++cScreenId)
+    for (uint cScreenId = 0; cScreenId < machine().GetGraphicsAdapter().GetMonitorCount(); ++cScreenId)
         addMachineWindow(UIMachineWindow::create(this, cScreenId));
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp

@@ -31 +31 @@
 
 /* COM includes: */
+#include "CGraphicsAdapter.h"
 #include "CGuest.h"
 #include "CVRDEServerInfo.h"
@@ -251 +252 @@
 void UIRuntimeInfoWidget::updateScreenInfo(int iScreenID /* = -1 */)
 {
-    ULONG uGuestScreens = m_machine.GetMonitorCount();
+    ULONG uGuestScreens = m_machine.GetGraphicsAdapter().GetMonitorCount();
     m_screenResolutions.resize(uGuestScreens);
     if (iScreenID != -1 && iScreenID >= (int)uGuestScreens)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -42 +42 @@
 #include "CConsole.h"
 #include "CDisplay.h"
+#include "CGraphicsAdapter.h"
 
 
@@ -319 +320 @@
 
     /* Get monitors count: */
-    ulong uMonitorCount = machine().GetMonitorCount();
+    ulong uMonitorCount = machine().GetGraphicsAdapter().GetMonitorCount();
     /* Create machine window(s): */
     for (ulong uScreenId = 0; uScreenId < uMonitorCount; ++ uScreenId)

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

@@ -36 +36 @@
 #endif
 
+/* GUI includes: */
+#include "CGraphicsAdapter.h"
+
 
 UIMachineLogicScale::UIMachineLogicScale(QObject *pParent, UISession *pSession)
@@ -138 +141 @@
 
     /* Get monitors count: */
-    ulong uMonitorCount = machine().GetMonitorCount();
+    ulong uMonitorCount = machine().GetGraphicsAdapter().GetMonitorCount();
     /* Create machine window(s): */
     for (ulong uScreenId = 0; uScreenId < uMonitorCount; ++ uScreenId)

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

@@ -33 +33 @@
 #include "CConsole.h"
 #include "CDisplay.h"
+#include "CGraphicsAdapter.h"
 
 /* Other VBox includes: */
@@ -71 +72 @@
     {
         /* Propagate scale-factor to 3D service if necessary: */
-        if (machine().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
         {
             double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
@@ -130 +131 @@
     {
         /* Propagate scale-factor to 3D service if necessary: */
-        if (machine().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
         {
             double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
@@ -153 +154 @@
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
     /* Propagate unscaled-hidpi-output feature to 3D service if necessary: */
-    if (machine().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
         display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
 

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

@@ -37 +37 @@
 #endif /* VBOX_WS_MAC */
 
+/* GUI includes: */
+#include "CGraphicsAdapter.h"
+
 
 UIMachineLogicSeamless::UIMachineLogicSeamless(QObject *pParent, UISession *pSession)
@@ -59 +62 @@
     if (uisession()->isGuestSupportsSeamless())
     {
-        quint64 availBits = machine().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
+        quint64 availBits = machine().GetGraphicsAdapter().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
         quint64 usedBits = m_pScreenLayout->memoryRequirements();
         if (availBits < usedBits)
@@ -268 +271 @@
 
     /* Create machine-window(s): */
-    for (uint cScreenId = 0; cScreenId < machine().GetMonitorCount(); ++cScreenId)
+    for (uint cScreenId = 0; cScreenId < machine().GetGraphicsAdapter().GetMonitorCount(); ++cScreenId)
         addMachineWindow(UIMachineWindow::create(this, cScreenId));
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -52 +52 @@
 
 /* COM includes: */
+#include "CGraphicsAdapter.h"
 #include "CUSBController.h"
 
@@ -469 +470 @@
         {
             if (pDisplayPage && pDisplayPage->isAcceleration2DVideoSelected())
-                m_machine.SetAccelerate2DVideoEnabled(false);
+                m_machine.GetGraphicsAdapter().SetAccelerate2DVideoEnabled(false);
         }
 #endif /* VBOX_WITH_VIDEOHWACCEL */
@@ -478 +479 @@
             && pDisplayPage->isAcceleration3DSelected()
             && pDisplayPage->graphicsControllerTypeCurrent() != pDisplayPage->graphicsControllerTypeRecommended())
-            m_machine.SetGraphicsControllerType(pDisplayPage->graphicsControllerTypeRecommended());
+            m_machine.GetGraphicsAdapter().SetGraphicsControllerType(pDisplayPage->graphicsControllerTypeRecommended());
 #endif /* VBOX_WITH_3D_ACCELERATION */
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -27 +27 @@
 
 /* COM includes: */
+#include "CGraphicsAdapter.h"
 #include "CRecordingSettings.h"
 #include "CRecordingScreenSettings.h"
@@ -371 +372 @@
 
     /* Gather old 'Screen' data: */
-    oldDisplayData.m_iCurrentVRAM = m_machine.GetVRAMSize();
-    oldDisplayData.m_cGuestScreenCount = m_machine.GetMonitorCount();
+    const CGraphicsAdapter &comGraphics = m_machine.GetGraphicsAdapter();
+    oldDisplayData.m_iCurrentVRAM = comGraphics.GetVRAMSize();
+    oldDisplayData.m_cGuestScreenCount = comGraphics.GetMonitorCount();
     oldDisplayData.m_scaleFactors = gEDataManager->scaleFactors(m_machine.GetId());
-    oldDisplayData.m_graphicsControllerType = m_machine.GetGraphicsControllerType();
+    oldDisplayData.m_graphicsControllerType = comGraphics.GetGraphicsControllerType();
 #ifdef VBOX_WITH_3D_ACCELERATION
-    oldDisplayData.m_f3dAccelerationEnabled = m_machine.GetAccelerate3DEnabled();
+    oldDisplayData.m_f3dAccelerationEnabled = comGraphics.GetAccelerate3DEnabled();
 #endif
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    oldDisplayData.m_f2dVideoAccelerationEnabled = m_machine.GetAccelerate2DVideoEnabled();
+    oldDisplayData.m_f2dVideoAccelerationEnabled = comGraphics.GetAccelerate2DVideoEnabled();
 #endif
     /* Check whether remote display server is valid: */
@@ -1373 +1375 @@
     if (fSuccess)
     {
+        CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
         /* Get old display data from the cache: */
         const UIDataSettingsMachineDisplay &oldDisplayData = m_pCache->base();
@@ -1381 +1384 @@
         if (fSuccess && isMachineOffline() && newDisplayData.m_iCurrentVRAM != oldDisplayData.m_iCurrentVRAM)
         {
-            m_machine.SetVRAMSize(newDisplayData.m_iCurrentVRAM);
-            fSuccess = m_machine.isOk();
+            comGraphics.SetVRAMSize(newDisplayData.m_iCurrentVRAM);
+            fSuccess = comGraphics.isOk();
         }
         /* Save guest screen count: */
         if (fSuccess && isMachineOffline() && newDisplayData.m_cGuestScreenCount != oldDisplayData.m_cGuestScreenCount)
         {
-            m_machine.SetMonitorCount(newDisplayData.m_cGuestScreenCount);
-            fSuccess = m_machine.isOk();
+            comGraphics.SetMonitorCount(newDisplayData.m_cGuestScreenCount);
+            fSuccess = comGraphics.isOk();
         }
         /* Save the Graphics Controller Type: */
         if (fSuccess && isMachineOffline() && newDisplayData.m_graphicsControllerType != oldDisplayData.m_graphicsControllerType)
         {
-            m_machine.SetGraphicsControllerType(newDisplayData.m_graphicsControllerType);
-            fSuccess = m_machine.isOk();
+            comGraphics.SetGraphicsControllerType(newDisplayData.m_graphicsControllerType);
+            fSuccess = comGraphics.isOk();
         }
 #ifdef VBOX_WITH_3D_ACCELERATION
@@ -1400 +1403 @@
         if (fSuccess && isMachineOffline() && newDisplayData.m_f3dAccelerationEnabled != oldDisplayData.m_f3dAccelerationEnabled)
         {
-            m_machine.SetAccelerate3DEnabled(newDisplayData.m_f3dAccelerationEnabled);
-            fSuccess = m_machine.isOk();
+            comGraphics.SetAccelerate3DEnabled(newDisplayData.m_f3dAccelerationEnabled);
+            fSuccess = comGraphics.isOk();
         }
 #endif
@@ -1408 +1411 @@
         if (fSuccess && isMachineOffline() && newDisplayData.m_f2dVideoAccelerationEnabled != oldDisplayData.m_f2dVideoAccelerationEnabled)
         {
-            m_machine.SetAccelerate2DVideoEnabled(newDisplayData.m_f2dVideoAccelerationEnabled);
-            fSuccess = m_machine.isOk();
+            comGraphics.SetAccelerate2DVideoEnabled(newDisplayData.m_f2dVideoAccelerationEnabled);
+            fSuccess = comGraphics.isOk();
         }
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

@@ -44 +44 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
+#include "CGraphicsAdapter.h"
 #include "CRecordingSettings.h"
 #include "CRecordingScreenSettings.h"
@@ -1311 +1312 @@
         case DetailsElementType_Display:
         {
+            const CGraphicsAdapter &comGraphics = comMachine.GetGraphicsAdapter();
+            const CGraphicsAdapter &comGraphicsOld = comMachineOld.GetGraphicsAdapter();
             /* Video Memory: */
             ++iRowCount;
-            const QString strVram = QApplication::translate("UIDetails", "%1 MB", "details").arg(comMachine.GetVRAMSize());
-            const QString strVramOld = QApplication::translate("UIDetails", "%1 MB", "details").arg(comMachineOld.GetVRAMSize());
+            const QString strVram = QApplication::translate("UIDetails", "%1 MB", "details").arg(comGraphics.GetVRAMSize());
+            const QString strVramOld = QApplication::translate("UIDetails", "%1 MB", "details").arg(comGraphicsOld.GetVRAMSize());
             strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIDetails", "Video Memory", "details (display)"),
                                                      empReport(strVram, strVramOld));
 
             /* Screens? */
-            const int cScreens = comMachine.GetMonitorCount();
-            const int cScreensOld = comMachineOld.GetMonitorCount();
+            const int cScreens = comGraphics.GetMonitorCount();
+            const int cScreensOld = comGraphicsOld.GetMonitorCount();
             if (cScreens > 1)
             {
@@ -1341 +1344 @@
             /* Graphics Controller: */
             ++iRowCount;
-            const QString strGc = gpConverter->toString(comMachine.GetGraphicsControllerType());
-            const QString strGcOld = gpConverter->toString(comMachineOld.GetGraphicsControllerType());
+            const QString strGc = gpConverter->toString(comGraphics.GetGraphicsControllerType());
+            const QString strGcOld = gpConverter->toString(comGraphicsOld.GetGraphicsControllerType());
             strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIDetails", "Graphics Controller", "details (display)"),
                                                      empReport(strGc, strGcOld));
 
             /* Acceleration? */
-            const QString strAcceleration = displayAccelerationReport(comMachine);
-            const QString strAccelerationOld = displayAccelerationReport(comMachineOld);
+            const QString strAcceleration = displayAccelerationReport(comGraphics);
+            const QString strAccelerationOld = displayAccelerationReport(comGraphicsOld);
             if (!strAcceleration.isNull())
             {
@@ -1711 +1714 @@
 
 /* static */
-QString UISnapshotDetailsWidget::displayAccelerationReport(CMachine comMachine)
+QString UISnapshotDetailsWidget::displayAccelerationReport(CGraphicsAdapter comGraphics)
 {
     /* Prepare report: */
@@ -1717 +1720 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     /* 2D Video Acceleration? */
-    if (comMachine.GetAccelerate2DVideoEnabled())
+    if (comGraphics.GetAccelerate2DVideoEnabled())
         aReport << QApplication::translate("UIDetails", "2D Video", "details (display)");
 #endif
     /* 3D Acceleration? */
-    if (comMachine.GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+    if (comGraphics.GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
         aReport << QApplication::translate("UIDetails", "3D", "details (display)");
     /* Compose and return report: */

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.h

@@ -31 +31 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CGraphicsAdapter.h"
 #include "CMachine.h"
 #include "CSnapshot.h"
@@ -162 +163 @@
     static double scaleFactorReport(CMachine comMachine);
     /** Acquires @a comMachine display acceleration report. */
-    static QString displayAccelerationReport(CMachine comMachine);
+    static QString displayAccelerationReport(CGraphicsAdapter comGraphics);
     /** Acquires @a comMachine VRDE server report. */
     static QStringList vrdeServerReport(CMachine comMachine);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -28 +28 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
+#include "CGraphicsAdapter.h"
 #include "CUSBController.h"
 #include "CUSBDeviceFilters.h"
@@ -129 +130 @@
     m_machine.SetMemorySize(field("ram").toUInt());
     /* Correct the VRAM size since API does not take fullscreen memory requirements into account: */
-    m_machine.SetVRAMSize(qMax(m_machine.GetVRAMSize(), (ULONG)(UICommon::requiredVideoMemory(strTypeId) / _1M)));
+    CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
+    comGraphics.SetVRAMSize(qMax(comGraphics.GetVRAMSize(), (ULONG)(UICommon::requiredVideoMemory(strTypeId) / _1M)));
 #endif
 
@@ -149 +151 @@
     m_machine.SetMemorySize(field("ram").toInt());
 
+    CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
     /* Graphics Controller type: */
-    m_machine.SetGraphicsControllerType(comGuestType.GetRecommendedGraphicsController());
+    comGraphics.SetGraphicsControllerType(comGuestType.GetRecommendedGraphicsController());
 
     /* VRAM size - select maximum between recommended and minimum for fullscreen: */
-    m_machine.SetVRAMSize(qMax(comGuestType.GetRecommendedVRAM(), (ULONG)(UICommon::requiredVideoMemory(strGuestTypeId) / _1M)));
+    comGraphics.SetVRAMSize(qMax(comGuestType.GetRecommendedVRAM(), (ULONG)(UICommon::requiredVideoMemory(strGuestTypeId) / _1M)));
 
     /* Selecting recommended chipset type: */
@@ -275 +278 @@
     /* Set graphic bits: */
     if (comGuestType.GetRecommended2DVideoAcceleration())
-        m_machine.SetAccelerate2DVideoEnabled(comGuestType.GetRecommended2DVideoAcceleration());
+        comGraphics.SetAccelerate2DVideoEnabled(comGuestType.GetRecommended2DVideoAcceleration());
 
     if (comGuestType.GetRecommended3DAcceleration())
-        m_machine.SetAccelerate3DEnabled(comGuestType.GetRecommended3DAcceleration());
+        comGraphics.SetAccelerate3DEnabled(comGuestType.GetRecommended3DAcceleration());
 }