Changeset 77370 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 20, 2019 8:04:38 AM (6 years ago)

Author:

vboxsync

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

128917

Message:

Device/Graphics, pdm, Main, Front-ends: infrastructure for host software cursor.
bugref:9376: Complete hardware cursor implementation in VMSVGA.
This change provides the infrastructure for letting front-ends report to the
graphics device that they are able to render a pointer cursor at any location,
not just where the host cursor is, and for the device to ask them to do this.
It also provides mediation in Main/Display between multiple front-ends and the
device, and tells the guest that we can always render the cursor. In a
follow-up change the device is expected to add support for rendering the
cursor itself into the frame-buffer image it provides to the front-end if not
all attached front-ends are capable of rendering it.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.h (modified) (1 diff)
• DevVGA_VBVA.cpp (modified) (2 diffs)

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

@@ -585 +585 @@
                                        uint32_t dy, uint32_t fEnabled,
                                        uint32_t fNotifyGuest);
-DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, uint32_t fCapabilitiesAdded,
-                                                        uint32_t fCapabilitiesRemoved);
+DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, bool fSupportsRenderCursor, bool fSupportsMoveCursor);
 DECLCALLBACK(void) vbvaPortReportHostCursorPosition(PPDMIDISPLAYPORT pInterface, uint32_t x, uint32_t y);
 

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

@@ -2834 +2834 @@
 }
 
-DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, uint32_t fCapabilitiesAdded,
-                                                        uint32_t fCapabilitiesRemoved)
-{
+DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, bool fSupportsRenderCursor, bool fSupportsMoveCursor)
+{
+    LogRelFlowFunc(("fSupportsRenderCursor=%RTbool, fSupportsMoveCursor=%RTbool\n",
+                    fSupportsRenderCursor, fSupportsMoveCursor));
+#if 0
     PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
     int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    NOREF(fSupportsMoveCursor);
     AssertRC(rc);
-    pThis->fHostCursorCapabilities |= fCapabilitiesAdded;
-    pThis->fHostCursorCapabilities &= ~fCapabilitiesRemoved;
+    pThis->fHostCursorCapabilities = fSupportsRenderCursor ? VBOX_VBVA_CURSOR_CAPABILITY_HARDWARE : 0;
     if (pThis->fGuestCaps & VBVACAPS_IRQ && pThis->fGuestCaps & VBVACAPS_DISABLE_CURSOR_INTEGRATION)
         VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_CURSOR_CAPABILITIES);
     PDMCritSectLeave(&pThis->CritSect);
+#else
+    RT_NOREF(pInterface, fSupportsRenderCursor, fSupportsMoveCursor);
+#endif
 }
 
@@ -2885 +2890 @@
              pCtx->fPaused = true;
              memset(pCtx->aModeHints, ~0, sizeof(pCtx->aModeHints));
-             pVGAState->fHostCursorCapabilities = 0;
+             pVGAState->fHostCursorCapabilities = VBOX_VBVA_CURSOR_CAPABILITY_HARDWARE;
          }
      }