Changeset 49983 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 19, 2013 12:23:17 PM (11 years ago)

Author:

vboxsync

Message:

Devices/Graphics: VMware SVGA II compatible graphics emulation (2D only), including the associated small API and VBoxManage changes, contributed by trivirt AG.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1434 +1434 @@
                 break;
             case GraphicsControllerType_VBoxVGA:
-                rc = configGraphicsController(pDevices, "vga", pBusMgr, pMachine, biosSettings,
+#ifdef VBOX_WITH_VMSVGA
+            case GraphicsControllerType_VMSVGA:
+#endif
+                rc = configGraphicsController(pDevices, graphicsController, pBusMgr, pMachine, biosSettings,
                                               RT_BOOL(fHMEnabled));
                 if (FAILED(rc))
@@ -3186 +3189 @@
 
 int Console::configGraphicsController(PCFGMNODE pDevices,
-                                      const char *pcszDevice,
+                                      const GraphicsControllerType_T graphicsController,
                                       BusAssignmentManager *pBusMgr,
                                       const ComPtr<IMachine> &pMachine,
@@ -3198 +3201 @@
         HRESULT hrc;
         Bstr    bstr;
+        const char *pcszDevice = "vga";
 
 #define H()         AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE)
@@ -3216 +3220 @@
 #else
         NOREF(fHMEnabled);
+#endif
+
+#ifdef VBOX_WITH_VMSVGA
+        if (graphicsController == GraphicsControllerType_VMSVGA)
+        {
+            InsertConfigInteger(pCfg, "VMSVGAEnabled", true);
+#ifdef VBOX_WITH_VMSVGA3D
+            IFramebuffer *pFramebuffer = getDisplay()->getFramebuffer();
+            if (pFramebuffer)
+            {
+                LONG64 winId = 0;
+                /* @todo deal with multimonitor setup */
+                Assert(cMonitorCount == 1);
+                hrc = pFramebuffer->COMGETTER(WinId)(&winId);
+                InsertConfigInteger(pCfg, "HostWindowId", winId);
+            }
+            BOOL f3DEnabled;
+            pMachine->COMGETTER(Accelerate3DEnabled)(&f3DEnabled);
+            InsertConfigInteger(pCfg, "VMSVGA3dEnabled", f3DEnabled);
+#endif
+        }
 #endif