Changeset 64114 in vbox

Timestamp:

Sep 30, 2016 7:26:47 PM (8 years ago)

Author:

vboxsync

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

111071

Message:

bugref:8611:3D: X11 Guests ignore CR_VBOX_CAP_HOST_CAPS_NOT_SUFFICIENT: Check for the CR_VBOX_CAP_HOST_CAPS_NOT_SUFFICIENT host capability in the X11 Additions too, and disable 3D pass-through if it is found. This means that the host only supports OpenGL 2.0 or older, most likely Windows host software rendering.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/check3d.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/check3d.cpp

@@ -18 +18 @@
 #include "VBoxClient.h"
 
+#include <VBox/VBoxGuest.h>
 #include <VBox/VBoxGuestLib.h>
+#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+#include "../../common/VBoxGuestLib/VBGLR3Internal.h" /* HACK ALERT! Using vbglR3DoIOCtl directly!! */
 
 #include <stdlib.h>
+
+#define CR_VBOX_CAP_HOST_CAPS_NOT_SUFFICIENT 0x00000020
 
 static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
@@ -26 +31 @@
     int rc;
     HGCMCLIENTID cClientID;
+    CRVBOXHGCMGETCAPS caps;
     LogFlowFunc(("\n"));
 
@@ -36 +42 @@
     rc = VbglR3HGCMConnect("VBoxSharedCrOpenGL", &cClientID);
     if (RT_FAILURE(rc))
+        exit(1);
+    caps.hdr.result      = VERR_WRONG_ORDER;
+    caps.hdr.u32ClientID = cClientID;
+    caps.hdr.u32Function = SHCRGL_GUEST_FN_GET_CAPS_LEGACY;
+    caps.hdr.cParms      = SHCRGL_CPARMS_GET_CAPS_LEGACY;
+
+    caps.Caps.type       = VMMDevHGCMParmType_32bit;
+    caps.Caps.u.value32  = 0;
+
+    rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(caps)), &caps, sizeof(caps));
+    if (RT_FAILURE(rc))
+        exit(1);
+    if (caps.Caps.u.value32 & CR_VBOX_CAP_HOST_CAPS_NOT_SUFFICIENT)
         exit(1);
     VbglR3HGCMDisconnect(cClientID);