Changeset 47158 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jul 15, 2013 12:37:15 PM (12 years ago)

Author:

vboxsync

Message:

VRDP,Main,SharedOpenGL: enable 3d redirection if a RDP client connects

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (1 diff)
• crserverlib/server_main.c (modified) (2 diffs)
• crserverlib/server_muralfbo.c (modified) (1 diff)

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

@@ -1243 +1243 @@
                 else /* Execute the function. */
                 {
-                    rc = crVBoxServerSetOffscreenRendering(GL_TRUE);
-
-                    if (RT_SUCCESS(rc))
+                    if (pOutputRedirect->H3DORBegin != NULL)
                     {
-                        CROutputRedirect outputRedirect;
-                        outputRedirect.pvContext = pOutputRedirect->pvContext;
-                        outputRedirect.CRORBegin = pOutputRedirect->H3DORBegin;
-                        outputRedirect.CRORGeometry = pOutputRedirect->H3DORGeometry;
-                        outputRedirect.CRORVisibleRegion = pOutputRedirect->H3DORVisibleRegion;
-                        outputRedirect.CRORFrame = pOutputRedirect->H3DORFrame;
-                        outputRedirect.CROREnd = pOutputRedirect->H3DOREnd;
-                        outputRedirect.CRORContextProperty = pOutputRedirect->H3DORContextProperty;
-                        rc = crVBoxServerOutputRedirectSet(&outputRedirect);
+                        rc = crVBoxServerSetOffscreenRendering(GL_TRUE);
+
+                        if (RT_SUCCESS(rc))
+                        {
+                            CROutputRedirect outputRedirect;
+                            outputRedirect.pvContext = pOutputRedirect->pvContext;
+                            outputRedirect.CRORBegin = pOutputRedirect->H3DORBegin;
+                            outputRedirect.CRORGeometry = pOutputRedirect->H3DORGeometry;
+                            outputRedirect.CRORVisibleRegion = pOutputRedirect->H3DORVisibleRegion;
+                            outputRedirect.CRORFrame = pOutputRedirect->H3DORFrame;
+                            outputRedirect.CROREnd = pOutputRedirect->H3DOREnd;
+                            outputRedirect.CRORContextProperty = pOutputRedirect->H3DORContextProperty;
+                            rc = crVBoxServerOutputRedirectSet(&outputRedirect);
+                        }
+                    }
+                    else
+                    {
+                        /* Redirection is disabled. */
+                        crVBoxServerSetOffscreenRendering(GL_FALSE);
+                        crVBoxServerOutputRedirectSet(NULL);
                     }
                 }

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

@@ -2941 +2941 @@
 }
 
+static void crVBoxServerOutputRedirectCB(unsigned long key, void *data1, void *data2)
+{
+    CRMuralInfo *mural = (CRMuralInfo*) data1;
+
+    crServerSetupOutputRedirect(mural);
+}
+
 DECLEXPORT(int32_t) crVBoxServerOutputRedirectSet(const CROutputRedirect *pCallbacks)
 {
@@ -2954 +2961 @@
     }
 
-    // @todo dynamically intercept already existing output:
-    // crHashtableWalk(cr_server.muralTable, crVBoxServerOutputRedirectCB, NULL);
+    /* dynamically intercept already existing output */
+    crHashtableWalk(cr_server.muralTable, crVBoxServerOutputRedirectCB, NULL);
 
     return VINF_SUCCESS;

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

@@ -103 +103 @@
             cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance,
                                                        mural->cVisibleRects, (RTRECT *)mural->pVisibleRects);
+
+            crServerPresentFBO(mural);
         }
     }