Changeset 80375 in vbox

Timestamp:

Aug 21, 2019 5:48:30 PM (6 years ago)

Author:

vboxsync

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

132840

Message:

Main/ConsoleVRDPServer.cpp: Remove dependency on old chromium based 3D redirection, disabled generic code so it might get reused when this gets implemented for VMSVGA3D, bugref:9529

File:

• trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp (modified) (8 diffs)

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

@@ -49 +49 @@
 #include <VBox/RemoteDesktop/VRDEOrders.h>
 #include <VBox/com/listeners.h>
-#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
 
 
@@ -1796 +1795 @@
 }
 
+#if 0 /** @todo Chromium got removed (see @bugref{9529}) and this is not available for VMSVGA yet. */
 typedef struct H3DORInstance
 {
@@ -2096 +2096 @@
     return rc;
 }
+#endif
 
 void ConsoleVRDPServer::remote3DRedirect(bool fEnable)
@@ -2120 +2121 @@
     }
 
+#if 0 /** @todo Implement again for VMSVGA. */
     /* Tell the host 3D service to redirect output using the ConsoleVRDPServer callbacks. */
     H3DOUTPUTREDIRECT outputRedirect =
@@ -2137 +2139 @@
         RT_ZERO(outputRedirect);
     }
-
-#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
-    VBOXCRCMDCTL_HGCM data;
-    data.Hdr.enmType = VBOXCRCMDCTL_TYPE_HGCM;
-    data.Hdr.u32Function = SHCRGL_HOST_FN_SET_OUTPUT_REDIRECT;
-
-    data.aParms[0].type = VBOX_HGCM_SVC_PARM_PTR;
-    data.aParms[0].u.pointer.addr = &outputRedirect;
-    data.aParms[0].u.pointer.size = sizeof(outputRedirect);
-
-    int rc = mConsole->i_getDisplay()->i_crCtlSubmitSync(&data.Hdr, sizeof (data));
-    if (!RT_SUCCESS(rc))
-    {
-        Log(("SHCRGL_HOST_FN_SET_CONSOLE failed with %Rrc\n", rc));
-        return;
-    }
-
-    LogRel(("VRDE: %s 3D redirect.\n", fEnable? "Enabled": "Disabled"));
-# ifdef DEBUG_misha
-    AssertFailed();
-# endif
 #endif
 
@@ -2171 +2152 @@
 {
     RT_NOREF(hVideo);
-    H3DORLOG(("H3DOR: VRDEImageCbNotify: pvContext %p, pvUser %p, hVideo %p, u32Id %u, pvData %p, cbData %d\n",
+    Log(("H3DOR: VRDEImageCbNotify: pvContext %p, pvUser %p, hVideo %p, u32Id %u, pvData %p, cbData %d\n",
               pvContext, pvUser, hVideo, u32Id, pvData, cbData));
 
     ConsoleVRDPServer *pServer = static_cast<ConsoleVRDPServer*>(pvContext); NOREF(pServer);
+
+#if 0 /** @todo Implement again for VMSVGA. */
     H3DORInstance *p = (H3DORInstance *)pvUser;
     Assert(p);
@@ -2189 +2172 @@
 
         uint32_t u32StreamId = *(uint32_t *)pvData;
-        H3DORLOG(("H3DOR: VRDE_IMAGE_NOTIFY_HANDLE_CREATE u32StreamId %d\n",
+        Log(("H3DOR: VRDE_IMAGE_NOTIFY_HANDLE_CREATE u32StreamId %d\n",
                   u32StreamId));
 
@@ -2201 +2184 @@
         }
     }
+#endif
 
     return VINF_SUCCESS;