Changeset 84740 in vbox

Timestamp:

Jun 9, 2020 3:28:30 PM (5 years ago)

Author:

vboxsync

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

138533

Message:

Main,include: provide a new method for the graphics device to pass notifications to a frontend

Location:

trunk

Files:

• include/VBox/Graphics/VBoxVideo3D.h (modified) (1 diff)
• include/VBox/vmm/pdmifs.h (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (2 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)
• src/VBox/Main/include/DisplayImpl.h (modified) (2 diffs)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (3 diffs)

trunk/include/VBox/Graphics/VBoxVideo3D.h

@@ -143 +143 @@
 
 /* host 3D->Fe[/Qt] notification mechanism defines */
-#define VBOX3D_NOTIFY_EVENT_TYPE_TEST_FUNCTIONAL 3
-#define VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_VISIBLE  4
-#define VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_HIDDEN   5
+typedef enum
+{
+    VBOX3D_NOTIFY_TYPE_TEST_FUNCTIONAL = 3,
+    VBOX3D_NOTIFY_TYPE_3DDATA_VISIBLE  = 4,
+    VBOX3D_NOTIFY_TYPE_3DDATA_HIDDEN   = 5,
 
+    VBOX3D_NOTIFY_TYPE_HW_SCREEN_IS_SUPPORTED = 100,
+    VBOX3D_NOTIFY_TYPE_HW_SCREEN_CREATED      = 101,
+    VBOX3D_NOTIFY_TYPE_HW_SCREEN_DESTROYED    = 102,
+    VBOX3D_NOTIFY_TYPE_HW_SCREEN_UPDATE_BEGIN = 103,
+    VBOX3D_NOTIFY_TYPE_HW_SCREEN_UPDATE_END   = 104,
+
+    VBOX3D_NOTIFY_TYPE_32BIT_HACK = 0x7fffffff
+} VBOX3D_NOTIFY_TYPE;
+
+typedef struct VBOX3DNOTIFY
+{
+    VBOX3D_NOTIFY_TYPE enmNotification;
+    int32_t  iDisplay;
+    uint32_t u32Reserved;
+    uint32_t cbData;
+    uint8_t  au8Data[sizeof(uint64_t)];
+} VBOX3DNOTIFY;
 
 #endif /* !VBOX_INCLUDED_Graphics_VBoxVideo3D_h */

trunk/include/VBox/vmm/pdmifs.h

@@ -737 +737 @@
 /** @} */
 
+/** Pointer to a 3D graphics notification. */
+typedef struct VBOX3DNOTIFY VBOX3DNOTIFY;
 /** Pointer to a 2D graphics acceleration command. */
 typedef struct VBOXVHWACMD VBOXVHWACMD;
@@ -1026 +1028 @@
      */
     DECLR3CALLBACKMEMBER(void, pfnVBVAReportCursorPosition,(PPDMIDISPLAYCONNECTOR pInterface, uint32_t fFlags, uint32_t uScreen, uint32_t x, uint32_t y));
+
+    /**
+     * Process the graphics device HW Acceleration command.
+     *
+     * @param   pInterface          Pointer to this interface.
+     * @param   p3DNotify           Acceleration Command to be processed.
+     * @thread  The graphics device thread: FIFO for the VMSVGA device.
+     */
+    DECLR3CALLBACKMEMBER(int, pfn3DNotifyProcess,(PPDMIDISPLAYCONNECTOR pInterface,
+                                                  VBOX3DNOTIFY *p3DNotify));
 } PDMIDISPLAYCONNECTOR;
 /** PDMIDISPLAYCONNECTOR interface ID. */
-#define PDMIDISPLAYCONNECTOR_IID                "b71dc381-99cc-43de-b459-f1e812e73b65"
+#define PDMIDISPLAYCONNECTOR_IID                "cdd562e4-8030-11ea-8d40-bbc8e146c565"
 
 

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

@@ -1042 +1042 @@
     switch (uType)
     {
-        case VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_VISIBLE:
-        case VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_HIDDEN:
+        case VBOX3D_NOTIFY_TYPE_3DDATA_VISIBLE:
+        case VBOX3D_NOTIFY_TYPE_3DDATA_HIDDEN:
         {
             /* Notify machine-view with the async-signal
              * about 3D overlay visibility change: */
-            BOOL fVisible = uType == VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_VISIBLE;
+            BOOL fVisible = uType == VBOX3D_NOTIFY_TYPE_3DDATA_VISIBLE;
             LogRel2(("GUI: UIFrameBufferPrivate::Notify3DEvent: Sending to async-handler: "
-                     "(VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_%s)\n",
+                     "(VBOX3D_NOTIFY_TYPE_3DDATA_%s)\n",
                      fVisible ? "VISIBLE" : "HIDDEN"));
             emit sigNotifyAbout3DOverlayVisibilityChange(fVisible);
@@ -1060 +1060 @@
         }
 
-        case VBOX3D_NOTIFY_EVENT_TYPE_TEST_FUNCTIONAL:
+        case VBOX3D_NOTIFY_TYPE_TEST_FUNCTIONAL:
         {
             HRESULT hr = m_fUnused ? E_FAIL : S_OK;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -18920 +18920 @@
 
       <param name="type" type="unsigned long" dir="in">
-        <desc>event type. Currently only VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA is supported.</desc>
+        <desc>event type. VBOX3D_NOTIFY_TYPE_* in VBoxVideo3D.h</desc>
       </param>
       <param name="data" type="octet" dir="in" safearray="yes">

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -160 +160 @@
     int  i_handleVHWACommandProcess(int enmCmd, bool fGuestCmd, VBOXVHWACMD RT_UNTRUSTED_VOLATILE_GUEST *pCommand);
 #endif
+    int  i_handle3DNotifyProcess(VBOX3DNOTIFY *p3DNotify);
 
     int  i_saveVisibleRegion(uint32_t cRect, PRTRECT pRect);
@@ -317 +318 @@
                                                           VBOXVHWACMD RT_UNTRUSTED_VOLATILE_GUEST *pCommand);
 #endif
+    static DECLCALLBACK(int)  i_display3DNotifyProcess(PPDMIDISPLAYCONNECTOR pInterface,
+                                                       VBOX3DNOTIFY *p3DNotify);
 
 #ifdef VBOX_WITH_HGSMI

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

@@ -43 +43 @@
 # include <VBoxVideo.h>
 #endif
+#include <VBoxVideo3D.h>
 
 #include <VBox/com/array.h>
@@ -3141 +3142 @@
 
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+
+int Display::i_handle3DNotifyProcess(VBOX3DNOTIFY *p3DNotify)
+{
+    unsigned const id = (unsigned)p3DNotify->iDisplay;
+    if (id >= mcMonitors)
+        return VERR_INVALID_PARAMETER;
+
+    ComPtr<IFramebuffer> pFramebuffer;
+    AutoReadLock arlock(this COMMA_LOCKVAL_SRC_POS);
+    pFramebuffer = maFramebuffers[id].pFramebuffer;
+    arlock.release();
+
+    int rc = VINF_SUCCESS;
+
+    if (!pFramebuffer.isNull())
+    {
+        com::SafeArray<BYTE> data;
+        data.initFrom((BYTE *)&p3DNotify->au8Data[0], p3DNotify->cbData);
+
+        HRESULT hr = pFramebuffer->Notify3DEvent((ULONG)p3DNotify->enmNotification, ComSafeArrayAsInParam(data));
+        if (FAILED(hr))
+            rc = VERR_NOT_SUPPORTED;
+    }
+    else
+        rc = VERR_NOT_IMPLEMENTED;
+
+    return rc;
+}
+
+DECLCALLBACK(int) Display::i_display3DNotifyProcess(PPDMIDISPLAYCONNECTOR pInterface,
+                                                    VBOX3DNOTIFY *p3DNotify)
+{
+    PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
+    return pDrv->pDisplay->i_handle3DNotifyProcess(p3DNotify);
+}
 
 HRESULT Display::notifyScaleFactorChange(ULONG aScreenId, ULONG aScaleFactorWMultiplied, ULONG aScaleFactorHMultiplied)
@@ -3722 +3758 @@
     pThis->IConnector.pfnVBVAReportCursorPosition = Display::i_displayVBVAReportCursorPosition;
 #endif
+    pThis->IConnector.pfn3DNotifyProcess       = Display::i_display3DNotifyProcess;
 
     /*