Changeset 12449 in vbox for trunk

Timestamp:

Sep 15, 2008 8:16:14 AM (16 years ago)

Author:

vboxsync

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

36526

Message:

+changed IFramebuffer interface to report id of associated window if there's one
+changed sdl/qt3/qt4 frontends's interface implementations to report this id
+added VBoxSharedCrOpenGL hgcm service
(VBoxManage.exe setextradata lvm_winxp_sp2 VBoxInternal/Devices/VMMDev/0/LUN#0/Config/crOpenGLEnabled 1)
+changed crserver to be launched from vmmdev by guest request
+added hgcm call to supply desired window id to render spu
+changed guest icd driver to initialize hgcm and cause tcpip listener startup on host
+fixed spu finalization
+fixed q3 startup, again :)

Location:

trunk

Files:

• include/VBox/log.h (modified) (2 diffs)
• src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxSDL/Framebuffer.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxSDL/Framebuffer.h (modified) (4 diffs)
• src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)
• src/VBox/Frontends/VBoxSDL/VBoxSDL.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox4/include/VBoxFrameBuffer.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox4/src/VBoxFrameBuffer.cpp (modified) (1 diff)
• src/VBox/Main/FramebufferImpl.cpp (modified) (1 diff)
• src/VBox/Main/VMMDevInterface.cpp (modified) (3 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)
• src/VBox/Main/include/FramebufferImpl.h (modified) (1 diff)

trunk/include/VBox/log.h

@@ -268 +268 @@
     /** SELM group. */
     LOG_GROUP_SELM,
+    /** Chromium OpenGL host service group. */
+    LOG_GROUP_SHARED_CROPENGL,
     /** Shared folders host service group. */
     LOG_GROUP_SHARED_FOLDERS,
@@ -431 +433 @@
     "REM_RUN",      \
     "SELM",         \
+    "SHARED_CROPENGL",\
     "SHARED_FOLDERS",\
     "SHARED_OPENGL",\

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.cpp

@@ -43 +43 @@
     Assert(ret);
 }
-
 
 /**

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

@@ -379 +379 @@
 
 /**
+ * Returns handle of window where framebuffer context is being drawn
+ *
+ * @returns COM status code.
+ * @param   winId Handle of associated window.
+ */
+STDMETHODIMP VBoxSDLFB::COMGETTER(WinId)(uint64_t *winId)
+{
+    if (!winId)
+        return E_POINTER;
+    *winId = mWinId;
+    return S_OK;
+}
+
+/**
  * Notify framebuffer of an update.
  *
@@ -1403 +1417 @@
 
 /**
+ * Returns associated window handle. We return NULL here.
+ *
+ * @returns COM status code
+ * @param   winId Address of result buffer.
+ */
+STDMETHODIMP VBoxSDLFBOverlay::COMGETTER(WinId)(ULONG64 *winId)
+{
+    LogFlow(("VBoxSDLFBOverlay::GetWinId\n"));
+    if (!winId)
+        return E_INVALIDARG;
+    *winId = 0;
+    return S_OK;
+}
+
+
+/**
  * Lock the overlay.  This should not be used - lock the parent IFramebuffer instead.
  *

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

@@ -99 +99 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId)) (uint64_t *winId);
 
     STDMETHOD(NotifyUpdate)(ULONG x, ULONG y,
@@ -135 +136 @@
 #endif
     void uninit();
+    void setWinId(uint64_t winId) { mWinId = winId; }
 
 private:
@@ -176 +178 @@
     /** flag whether we print out SDL information */
     bool mfShowSDLConfig;
+    /** handle to window where framebuffer context is being drawn*/
+    uint64_t mWinId;
 #ifdef VBOX_SECURELABEL
     /** current secure label text */
@@ -263 +267 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId)) (ULONG64 *winId);
 
     STDMETHOD(Lock)();

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

@@ -1057 +1057 @@
 #endif
 #ifdef VBOX_WIN32_UI
-    bool fWin32UI = false;
+    bool fWin32UI = true;
+    uint64_t winId = 0;
 #endif
     bool fShowSDLConfig    = false;
@@ -1920 +1921 @@
     {
         /* initialize the Win32 user interface inside which SDL will be embedded */
-        if (initUI(fResizable))
+        if (initUI(fResizable, winId))
             return 1;
     }
@@ -1934 +1935 @@
         goto leave;
     }
+
+#ifdef VBOX_WIN32_UI
+    gpFrameBuffer->setWinId(winId);
+#endif
+
     if (!gpFrameBuffer->initialized())
         goto leave;

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

@@ -66 +66 @@
 
 #ifdef VBOX_WIN32_UI
-int initUI(bool fResizable);
+int initUI(bool fResizable, uint64_t &winId);
 int uninitUI(void);
 int resizeUI(uint16_t width, uint16_t height);

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

@@ -205 +205 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *aHeightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId)) (ULONG64 *winId);
 
     STDMETHOD(Lock)();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp

@@ -134 +134 @@
     /* not yet implemented */
     *aOverlay = 0;
+    return S_OK;
+}
+
+STDMETHODIMP VBoxFrameBuffer::COMGETTER(WinId) (ULONG64 *winId)
+{
+    if (!winId)
+        return E_POINTER;
+    *winId = (mView && mView->viewport()) ? (ULONG64) mView->viewport()->winId() : 0;   
     return S_OK;
 }

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxFrameBuffer.h

@@ -205 +205 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *aHeightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId)) (ULONG64 *winId);
 
     STDMETHOD(Lock)();

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxFrameBuffer.cpp

@@ -135 +135 @@
     /* not yet implemented */
     *aOverlay = 0;
+    return S_OK;
+}
+
+STDMETHODIMP VBoxFrameBuffer::COMGETTER(WinId) (ULONG64 *winId)
+{
+    if (!winId)
+        return E_POINTER;
+    *winId = (mView && mView->viewport()) ? (ULONG64) mView->viewport()->winId() : 0;   
     return S_OK;
 }

trunk/src/VBox/Main/FramebufferImpl.cpp

@@ -131 +131 @@
 }
 
+STDMETHODIMP InternalFramebuffer::COMGETTER(WinId) (ULONG64 *winId)
+{
+    if (!winId)
+        return E_POINTER;
+    *winId = 0;
+    return S_OK;
+}
 
 // IFramebuffer methods

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -36 +36 @@
 #include "hgcm/HGCM.h"
 #include "hgcm/HGCMObjects.h"
+#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
 #endif
 
@@ -695 +696 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0OpenGLEnabled\0"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0OpenGLEnabled\0crOpenGLEnabled\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
     PPDMIBASE pBaseIgnore;
@@ -814 +815 @@
         {
             LogRel(("Failed to load Shared OpenGL service %Vrc\n", rc));
+        }
+    }
+
+    rc = CFGMR3QueryBool(pCfgHandle, "crOpenGLEnabled", &fEnabled);
+    if ( VBOX_SUCCESS(rc) &&  fEnabled)
+    {
+        rc = pData->pVMMDev->hgcmLoadService ("VBoxSharedCrOpenGL", "VBoxSharedCrOpenGL");
+        if (VBOX_SUCCESS(rc))
+        {
+            LogRel(("Shared Chromium OpenGL service loaded.\n"));
+
+            /* Setup the service. */
+            VBOXHGCMSVCPARM parm;
+            parm.type = VBOX_HGCM_SVC_PARM_PTR;
+
+            //parm.u.pointer.addr = static_cast <IConsole *> (pData->pVMMDev->getParent());
+                        parm.u.pointer.addr = pData->pVMMDev->getParent()->getDisplay()->getFramebuffer();
+            parm.u.pointer.size = sizeof(IFramebuffer *);
+        
+            rc = HGCMHostCall("VBoxSharedCrOpenGL", VBOX_SHARED_CROPENGL_HOST_FN_SET_FRAMEBUFFER, 1, &parm);
+            if (!VBOX_SUCCESS(rc))
+                AssertMsgFailed(("VBOX_SHARED_CROPENGL_HOST_FN_SET_FRAMEBUFFER failed with %Vrc\n", rc));
+        }
+        else
+        {
+            LogRel(("Failed to load Shared Chromium OpenGL service %Vrc\n", rc));
         }
     }

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

@@ -8001 +8001 @@
     </attribute>
 
+    <attribute name="winId" type="unsigned long long" readonly="yes">
+      <desc>
+        Platform-dependent identifier of the window where context of this
+        framebuffer is drawn, or zero if there's no such window.
+      </desc>
+    </attribute>
+
     <method name="lock">
       <desc>

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

@@ -57 +57 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId)) (ULONG64 *winId);
 
     // IFramebuffer methods