Changeset 36843 in vbox for trunk/src/VBox/HostServices

Timestamp:

Apr 26, 2011 8:33:19 AM (14 years ago)

Author:

vboxsync

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

71402

Message:

3D for VRDP: initial commit (xTracker 5565).

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (3 diffs)
• crserverlib/server.h (modified) (1 diff)
• crserverlib/server_config.c (modified) (1 diff)
• crserverlib/server_main.c (modified) (1 diff)
• crserverlib/server_muralfbo.c (modified) (3 diffs)
• crserverlib/server_window.c (modified) (4 diffs)

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

@@ -164 +164 @@
         }
 
+        // @todo use critsect only to fetch the list and update the g_SvcPresentFBO's pQueueHead and pQueueTail.
         rc = RTCritSectEnter(&g_SvcPresentFBO.hQueueLock);
         AssertRCReturn(rc, rc);
@@ -1242 +1243 @@
                     g_pConsole = pConsole;
 
-                    /*rc = crVBoxServerSetOffscreenRendering(GL_TRUE);*/
                     rc = VINF_SUCCESS;
                 }
@@ -1349 +1349 @@
 
                 rc = VINF_SUCCESS;
+            }
+            break;
+        }
+        case SHCRGL_HOST_FN_SET_OUTPUT_REDIRECT:
+        {
+            /*
+             * OutputRedirect.
+             * Note: the service calls OutputRedirect callbacks directly
+             *       and they must not block. If asynchronous processing is needed,
+             *       the callback provider must organize this.
+             */
+            Log(("svcCall: SHCRGL_HOST_FN_SET_OUTPUT_REDIRECT\n"));
+
+            /* Verify parameter count and types. */
+            if (cParms != SHCRGL_CPARMS_SET_OUTPUT_REDIRECT)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else if (paParms[0].type != VBOX_HGCM_SVC_PARM_PTR)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                /* Fetch parameters. */
+                H3DOUTPUTREDIRECT *pOutputRedirect = (H3DOUTPUTREDIRECT *)paParms[0].u.pointer.addr;
+                uint32_t cbData = paParms[0].u.pointer.size;
+
+                /* Verify parameters values. */
+                if (cbData != sizeof (H3DOUTPUTREDIRECT))
+                {
+                    rc = VERR_INVALID_PARAMETER;
+                }
+                else /* Execute the function. */
+                {
+                    rc = crVBoxServerSetOffscreenRendering(GL_TRUE);
+
+                    if (RT_SUCCESS(rc))
+                    {
+                        CROutputRedirect or;
+                        or.pvContext = pOutputRedirect->pvContext;
+                        or.CRORBegin = pOutputRedirect->H3DORBegin;
+                        or.CRORGeometry = pOutputRedirect->H3DORGeometry;
+                        or.CRORVisibleRegion = pOutputRedirect->H3DORVisibleRegion;
+                        or.CRORFrame = pOutputRedirect->H3DORFrame;
+                        or.CROREnd = pOutputRedirect->H3DOREnd;
+                        or.CRORContextProperty = pOutputRedirect->H3DORContextProperty;
+                        rc = crVBoxServerOutputRedirectSet(&or);
+                    }
+                }
             }
             break;

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

@@ -89 +89 @@
 GLuint crServerTranslateProgramID(GLuint id);
 
+void crServerSetupOutputRedirect(CRMuralInfo *mural);
 void crServerCheckMuralGeometry(CRMuralInfo *mural);
 GLboolean crServerSupportRedirMuralFBO(void);

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

@@ -58 +58 @@
     cr_server.bForceOffscreenRendering = GL_FALSE;
     cr_server.bUsePBOForReadback = GL_FALSE;
+    cr_server.bUseOutputRedirect = GL_FALSE;
 }
 

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

@@ -1260 +1260 @@
     return VINF_SUCCESS;
 }
+
+DECLEXPORT(int32_t) crVBoxServerOutputRedirectSet(const CROutputRedirect *pCallbacks)
+{
+    /* No need for a synchronization as this is single threaded. */
+    if (pCallbacks)
+    {
+        cr_server.outputRedirect = *pCallbacks;
+        cr_server.bUseOutputRedirect = true;
+    }
+    else
+    {
+        cr_server.bUseOutputRedirect = false;
+    }
+
+    // @todo dynamically intercept already existing output:
+    // crHashtableWalk(cr_server.muralTable, crVBoxServerOutputRedirectCB, NULL);
+
+    return VINF_SUCCESS;
+}

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

@@ -46 +46 @@
 }
 
+/* Called when a new CRMuralInfo is created
+ * or when OutputRedirect status is changed.
+ */
+void crServerSetupOutputRedirect(CRMuralInfo *mural)
+{
+    /* Unset the previous redirect. */
+    if (mural->pvOutputRedirectInstance)
+    {
+        cr_server.outputRedirect.CROREnd(mural->pvOutputRedirectInstance);
+        mural->pvOutputRedirectInstance = NULL;
+    }
+
+    /* Setup a new redirect. */
+    if (cr_server.bUseOutputRedirect)
+    {
+        /* Query supported formats. */
+        uint32_t cbFormats = 4096;
+        char *pachFormats = (char *)crAlloc(cbFormats);
+
+        if (pachFormats)
+        {
+            int rc = cr_server.outputRedirect.CRORContextProperty(cr_server.outputRedirect.pvContext,
+                                                                  0 /* H3DOR_PROP_FORMATS */, // @todo from a header
+                                                                  pachFormats, cbFormats, &cbFormats);
+            if (RT_SUCCESS(rc))
+            {
+                if (strstr(pachFormats, "H3DOR_FMT_RGBA_TOPDOWN"))
+                {
+                    cr_server.outputRedirect.CRORBegin(cr_server.outputRedirect.pvContext,
+                                                       &mural->pvOutputRedirectInstance,
+                                                       "H3DOR_FMT_RGBA_TOPDOWN"); // @todo from a header
+                }
+            }
+
+            crFree(pachFormats);
+        }
+
+        /* If this is not NULL then there was a supported format. */
+        if (mural->pvOutputRedirectInstance)
+        {
+            cr_server.outputRedirect.CRORGeometry(mural->pvOutputRedirectInstance,
+                                                  mural->hX, mural->hY,
+                                                  mural->width, mural->height);
+            // @todo the code assumes that RTRECT == four of GLInts
+            cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance,
+                                                       mural->cVisibleRects, (RTRECT *)mural->pVisibleRects);
+        }
+    }
+}
+
 void crServerCheckMuralGeometry(CRMuralInfo *mural)
 {
@@ -136 +186 @@
             cr_server.head_spu->dispatch_table.WindowPosition(mural->spuWindow, mural->hX, mural->hY);
         }
+    }
+
+    if (mural->pvOutputRedirectInstance)
+    {
+        cr_server.outputRedirect.CRORGeometry(mural->pvOutputRedirectInstance,
+                                              mural->hX, mural->hY,
+                                              mural->width, mural->height);
     }
 }
@@ -455 +512 @@
     }
 
+    if (mural->pvOutputRedirectInstance)
+    {
+        /* @todo find out why presentfbo is not called but crorframe is called. */
+        cr_server.outputRedirect.CRORFrame(mural->pvOutputRedirectInstance,
+                                           pixels,
+                                           4 * mural->fboWidth * mural->fboHeight);
+    }
+
     if (bUsePBO)
     {

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

@@ -88 +88 @@
         mural->bReceivedRects = GL_FALSE;
 
+        mural->pvOutputRedirectInstance = NULL;
+
         /* generate ID for this new window/mural (special-case for file conns) */
         if (cr_server.curClient && cr_server.curClient->conn->type == CR_FILE)
@@ -99 +101 @@
         pCreateInfo->visualBits = visBits;
         crHashtableAdd(cr_server.pWindowCreateInfoTable, windowID, pCreateInfo);
+
+        crServerSetupOutputRedirect(mural);
     }
 
@@ -148 +152 @@
     }
 
+    if (mural->pvOutputRedirectInstance)
+    {
+        cr_server.outputRedirect.CROREnd(mural->pvOutputRedirectInstance);
+        mural->pvOutputRedirectInstance = NULL;
+    }
+
     if (cr_server.currentWindow == window)
     {
@@ -295 +305 @@
 
     cr_server.head_spu->dispatch_table.WindowVisibleRegion(mural->spuWindow, cRects, pRects);
+
+    if (mural->pvOutputRedirectInstance)
+    {
+        /* @todo the code assumes that RTRECT == four GLInts. */
+        cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance,
+                                                   cRects, (RTRECT *)pRects);
+    }
 }