Changeset 84722 in vbox

Timestamp:

Jun 8, 2020 10:57:01 AM (4 years ago)

Author:

vboxsync

Message:

bugref:9637. setting vmsvga relevant functions in DevVGA only when vmsvga is used.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (1 diff)
• DevVGA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -863 +863 @@
     PVMSVGAR3STATE      pSVGAState = pThisCC->svga.pSvgaR3State;
 
+    AssertReturnVoid(pSVGAState);
+
     /* We assume cPositions is the # of outputs Xserver reports and paPositions is (-1, -1) for disabled monitors. */
     cPositions = RT_MIN(cPositions, RT_ELEMENTS(pSVGAState->aScreens));

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -6586 +6586 @@
     pThisCC->IPort.pfnCopyRect          = vgaR3PortCopyRect;
     pThisCC->IPort.pfnSetRenderVRAM     = vgaR3PortSetRenderVRAM;
+    pThisCC->IPort.pfnSetViewport       = NULL;
+    pThisCC->IPort.pfnReportMonitorPositions = NULL;
 # ifdef VBOX_WITH_VMSVGA
-    pThisCC->IPort.pfnSetViewport       = vmsvgaR3PortSetViewport;
-# else
-    pThisCC->IPort.pfnSetViewport       = NULL;
+    if (pThis->fVMSVGAEnabled)
+    {
+        pThisCC->IPort.pfnSetViewport = vmsvgaR3PortSetViewport;
+        pThisCC->IPort.pfnReportMonitorPositions = vmsvgaR3PortReportMonitorPositions;
+    }
 # endif
     pThisCC->IPort.pfnSendModeHint      = vbvaR3PortSendModeHint;
     pThisCC->IPort.pfnReportHostCursorCapabilities = vgaR3PortReportHostCursorCapabilities;
     pThisCC->IPort.pfnReportHostCursorPosition = vgaR3PortReportHostCursorPosition;
-# ifdef VBOX_WITH_VMSVGA
-    pThisCC->IPort.pfnReportMonitorPositions = vmsvgaR3PortReportMonitorPositions;
-# else
-    pThisCC->IPort.pfnReportMonitorPositions = NULL;
-# endif
-
 
 # if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)