Changeset 45940 in vbox

Timestamp:

May 7, 2013 8:16:31 PM (12 years ago)

Author:

vboxsync

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

85580

Message:

crOpenGL->Fe/Qt notification mechanism

Location:

trunk

Files:

• include/VBox/VBoxVideo3D.h (modified) (1 diff)
• src/VBox/Frontends/VBoxFB/Framebuffer.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxFB/Framebuffer.h (modified) (1 diff)
• src/VBox/Frontends/VBoxHeadless/Framebuffer.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxHeadless/Framebuffer.h (modified) (1 diff)
• src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h (modified) (1 diff)
• src/VBox/Frontends/VBoxSDL/Framebuffer.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxSDL/Framebuffer.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/include/cr_server.h (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server.h (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c (modified) (5 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)

trunk/include/VBox/VBoxVideo3D.h

@@ -134 +134 @@
     } while (0)
 
+
+/* host 3D->Fe[/Qt] notification mechanism defines */
+#define VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW 1
+
 #endif /* #ifndef ___VBox_VBoxVideo3D_h */

trunk/src/VBox/Frontends/VBoxFB/Framebuffer.cpp

@@ -353 +353 @@
 }
 
+NS_IMETHODIMP VBoxDirectFB::Notify3DEvent(PRUint32 type, PRUint8 *reserved)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 int VBoxDirectFB::createSurface(uint32_t w, uint32_t h)
 {

trunk/src/VBox/Frontends/VBoxFB/Framebuffer.h

@@ -53 +53 @@
     NS_IMETHOD ProcessVHWACommand(PRUint8 *pCommand);
 
+    NS_IMETHOD Notify3DEvent(PRUint32 type, PRUint8 *reserved);
 private:
     int createSurface(uint32_t w, uint32_t h);

trunk/src/VBox/Frontends/VBoxHeadless/Framebuffer.cpp

@@ -294 +294 @@
     return E_NOTIMPL;
 }
+
+STDMETHODIMP VRDPFramebuffer::Notify3DEvent(ULONG uType, BYTE *pReserved)
+{
+    return E_NOTIMPL;
+}

trunk/src/VBox/Frontends/VBoxHeadless/Framebuffer.h

@@ -70 +70 @@
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
 
+    STDMETHOD(Notify3DEvent)(ULONG uType, BYTE *pReserved);
 private:
     /* If the format is Opaque, then internal memory buffer is used.

trunk/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h

@@ -206 +206 @@
     }
 
+    STDMETHOD(Notify3DEvent)(ULONG uType, BYTE *pReserved)
+    {
+        return E_NOTIMPL;
+    }
+
 private:
     /** Guest framebuffer pixel format */

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

@@ -622 +622 @@
     return E_NOTIMPL;
 }
+
+STDMETHODIMP VBoxSDLFB::Notify3DEvent(ULONG uType, BYTE *pReserved)
+{
+    return E_NOTIMPL;
+}
+
 //
 // Internal public methods

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

@@ -95 +95 @@
 
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
+
+    STDMETHOD(Notify3DEvent)(ULONG uType, BYTE *pReserved);
 
     // internal public methods

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

@@ -27 +27 @@
 # include "UIMessageCenter.h"
 # include "VBoxGlobal.h"
+
+# include <VBox/VBoxVideo3D.h>
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -261 +263 @@
 }
 
+STDMETHODIMP UIFrameBuffer::Notify3DEvent(ULONG uType, BYTE *pReserved)
+{
+    switch (uType)
+    {
+        case VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW:
+            if (pReserved)
+                return E_INVALIDARG;
+
+            /* @todo: submit asynchronous event to GUI thread */
+            return E_NOTIMPL;
+        default:
+            return E_INVALIDARG;
+    }
+}
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
 void UIFrameBuffer::doProcessVHWACommand(QEvent *pEvent)

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

@@ -180 +180 @@
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
 
+    STDMETHOD(Notify3DEvent)(ULONG uType, BYTE *pReserved);
+
     ulong width() { return m_width; }
     ulong height() { return m_height; }

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -124 +124 @@
 
 typedef DECLCALLBACKPTR(void, PFNCR_SERVER_RPW_DATA) (const struct CR_SERVER_RPW_ENTRY* pEntry, void *pvEntryTexData);
+
+typedef DECLCALLBACKPTR(void, PFNCRSERVERNOTIFYEVENT) (int32_t screenId, uint32_t uEvent, void*pvData);
 
 typedef struct CR_SERVER_RPW_ENTRY
@@ -524 +526 @@
     GLboolean             bWindowsInitiallyHidden;
 
+    uint32_t              NotifyEventMap[(CR_MAX_GUEST_MONITORS + 31)/32];
+    uint32_t              cDisableEvent;
+    PFNCRSERVERNOTIFYEVENT pfnNotifyEventCB;
+
     /* @todo: should we use just one blitter?
      * we use two currently because the drawable attribs can differ*/
@@ -565 +571 @@
 extern DECLEXPORT(int32_t) crVBoxServerSetScreenViewport(int sIndex, int32_t x, int32_t y, uint32_t w, uint32_t h);
 
+extern DECLEXPORT(void) crServerVBoxSetNotifyEventCB(PFNCRSERVERNOTIFYEVENT pfnCb);
+
 #ifdef VBOX_WITH_CRHGSMI
 /* We moved all CrHgsmi command processing to crserverlib to keep the logic of dealing with CrHgsmi commands in one place.

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -244 +244 @@
     return rc;
 }
+
+static DECLCALLBACK(void) svcNotifyEventCB(int32_t screenId, uint32_t uEvent, void*pvData)
+{
+    ComPtr<IDisplay> pDisplay;
+    ComPtr<IFramebuffer> pFramebuffer;
+    LONG xo, yo;
+    LONG64 winId = 0;
+    ULONG monitorCount, i, w, h;
+
+    if (!g_pConsole)
+    {
+        crWarning("Console not defined!");
+        return;
+    }
+
+    CHECK_ERROR2_STMT(g_pConsole, COMGETTER(Display)(pDisplay.asOutParam()), return);
+
+    CHECK_ERROR2_STMT(pDisplay, GetFramebuffer(screenId, pFramebuffer.asOutParam(), &xo, &yo), return);
+
+    if (!pFramebuffer)
+        return;
+
+    CHECK_ERROR2_STMT(pFramebuffer, Notify3DEvent(VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW, NULL), return);
+}
+
 
 static DECLCALLBACK(int) svcUnload (void *)
@@ -1281 +1306 @@
 
             rc = svcPresentFBOInit();
+
+            crServerVBoxSetNotifyEventCB(svcNotifyEventCB);
         }
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -129 +129 @@
 void crServerCheckMuralGeometry(CRMuralInfo *mural);
 GLboolean crServerSupportRedirMuralFBO(void);
+
+void crVBoxServerNotifyEvent(int32_t idScreen);
 
 #define CR_SERVER_REDIR_F_NONE     0x00

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c

@@ -58 +58 @@
     cr_server.bUseOutputRedirect = GL_FALSE;
     cr_server.bWindowsInitiallyHidden = GL_FALSE;
+
+    memset(cr_server.NotifyEventMap, 0, sizeof (cr_server.NotifyEventMap));
+    cr_server.cDisableEvent = 0;
+    cr_server.pfnNotifyEventCB = NULL;
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -2574 +2574 @@
 #define MAPPED(screen) ((screen).winID != 0)
 
+extern DECLEXPORT(void) crServerVBoxSetNotifyEventCB(PFNCRSERVERNOTIFYEVENT pfnCb)
+{
+    cr_server.pfnNotifyEventCB = pfnCb;
+}
+
+void crVBoxServerNotifyEvent(int32_t idScreen)
+{
+    /* this is something unexpected, but just in case */
+    if (idScreen >= cr_server.screenCount)
+    {
+        crWarning("invalid screen id %d", idScreen);
+        return;
+    }
+
+    if (!cr_server.cDisableEvent)
+        cr_server.pfnNotifyEventCB(idScreen, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW, NULL);
+    else
+        ASMBitSet(cr_server.NotifyEventMap, idScreen);
+}
+
 static void crVBoxServerReparentMuralCB(unsigned long key, void *data1, void *data2)
 {
@@ -2586 +2606 @@
 
         renderspuReparentWindow(pMI->spuWindow);
+
+        if (pMI->bVisible && (pMI->fPresentMode & CR_SERVER_REDIR_F_DISPLAY))
+            crVBoxServerNotifyEvent(pMI->screenId);
 
         crServerVBoxCompositionDisableLeave(pMI, GL_FALSE);
@@ -2722 +2745 @@
     uint32_t cRects;
     const RTRECT *pRects;
-    int rc;
+    int rc = VINF_SUCCESS;
 
     fForcePresent = crServerVBoxCompositionPresentNeeded(pMI);

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

@@ -193 +193 @@
         renderspuReparentWindow(mural->spuWindow);
         renderspuSetWindowId(cr_server.screen[0].winID);
+
+        if (mural->bVisible && (mural->fPresentMode & CR_SERVER_REDIR_F_DISPLAY))
+            crVBoxServerNotifyEvent(mural->screenId);
     }
 
@@ -349 +352 @@
         {
             if  (mural->bVisible)
+            {
                 cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, GL_TRUE);
+                crVBoxServerNotifyEvent(mural->screenId);
+            }
             mural->fPresentMode |= CR_SERVER_REDIR_F_DISPLAY;
         }
@@ -748 +754 @@
 DECLEXPORT(void) crServerVBoxCompositionSetEnableStateGlobal(GLboolean fEnable)
 {
+    if (!fEnable)
+        ++cr_server.cDisableEvent;
+
     crHashtableWalk(cr_server.muralTable, crServerVBoxCompositionSetEnableStateGlobalCB, (void*)fEnable);
 
     crHashtableWalk(cr_server.dummyMuralTable, crServerVBoxCompositionSetEnableStateGlobalCB, (void*)fEnable);
+
+    if (fEnable)
+    {
+        --cr_server.cDisableEvent;
+        CRASSERT(cr_server.cDisableEvent < UINT32_MAX/2);
+        if(!cr_server.cDisableEvent)
+        {
+            int i;
+            for (i = 0; i < cr_server.screenCount; ++i)
+            {
+                if (!ASMBitTest(cr_server.NotifyEventMap, i))
+                    continue;
+
+                cr_server.pfnNotifyEventCB(i, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW, NULL);
+
+                ASMBitClear(cr_server.NotifyEventMap, i);
+            }
+        }
+    }
 }
 
@@ -907 +935 @@
         cr_serverCtxSwitchPostprocess(&CtxSwitch);
 
+#if 1
         if (RT_SUCCESS(rc))
         {
@@ -916 +945 @@
             }
         }
-
+#endif
         return;
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

@@ -807 +807 @@
     {
         cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, state);
-    }
-
-    mural->bVisible = state;
+
+        if (state)
+            crVBoxServerNotifyEvent(mural->screenId);
+    }
+
+    mural->bVisible = !!state;
 }
 

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

@@ -14276 +14276 @@
   <interface
     name="IFramebuffer" extends="$unknown"
-    uuid="b7ed347a-5765-40a0-ae1c-f543eb4ddeaf"
+    uuid="e3f122c0-adab-4fc9-a8dc-da112fb48428"
     wsmap="suppress"
     >
@@ -14598 +14598 @@
       <param name="command" type="octet" mod="ptr" dir="in">
         <desc>Pointer to VBOXVHWACMD containing the command to execute.</desc>
+      </param>
+    </method>
+
+    <method name="notify3DEvent">
+      <desc>
+        Notifies framebuffer about 3D backend event.
+      </desc>
+
+      <param name="type" type="unsigned long" dir="in">
+        <desc>event type. Currently only VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW is supported.</desc>
+      </param>
+      <param name="reserved" type="octet" mod="ptr" dir="in">
+        <desc>Reserved for future use, must be NULL.</desc>
       </param>
     </method>