Changeset 51330 in vbox for trunk/src/VBox/GuestHost

Timestamp:

May 21, 2014 7:46:25 PM (11 years ago)

Author:

vboxsync

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

93813

Message:

crOpenGL: more extended flexible caps info, backwards compatibility fixes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_protocol.h (modified) (1 diff)
• include/cr_server.h (modified) (1 diff)
• util/vboxhgcm.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_protocol.h

@@ -17 +17 @@
 extern "C" {
 #endif
+
+#define CR_CMDVBVA_VERSION              1
+
+#pragma pack(1)
+typedef struct CR_CAPS_INFO
+{
+    uint32_t u32Caps;
+    uint32_t u32CmdVbvaVersion;
+} CR_CAPS_INFO;
+#pragma pack()
+
 
 /*For now guest is allowed to connect host opengl service if protocol version matches exactly*/

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -520 +520 @@
 extern DECLEXPORT(int32_t) crVBoxServerClientRead(uint32_t u32ClientID, uint8_t *pBuffer, uint32_t *pcbBuffer);
 extern DECLEXPORT(int32_t) crVBoxServerClientSetVersion(uint32_t u32ClientID, uint32_t vMajor, uint32_t vMinor);
-extern DECLEXPORT(int32_t) crVBoxServerClientGetCaps(uint32_t u32ClientID, uint32_t *pu32Caps);
+extern DECLEXPORT(int32_t) crVBoxServerClientGetCapsLegacy(uint32_t u32ClientID, uint32_t *pu32Caps);
+extern DECLEXPORT(int32_t) crVBoxServerClientGetCapsNew(uint32_t u32ClientID, CR_CAPS_INFO *pInfo);
 extern DECLEXPORT(int32_t) crVBoxServerClientSetPID(uint32_t u32ClientID, uint64_t pid);
 

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -1287 +1287 @@
 }
 
-static int crVBoxHGCMGetHostCaps(CRConnection *conn, uint32_t *pu32HostCaps)
+static int crVBoxHGCMGetHostCapsLegacy(CRConnection *conn, uint32_t *pu32HostCaps)
 {
     CRVBOXHGCMGETCAPS caps;
@@ -1294 +1294 @@
     caps.hdr.result      = VERR_WRONG_ORDER;
     caps.hdr.u32ClientID = conn->u32ClientID;
-    caps.hdr.u32Function = SHCRGL_GUEST_FN_GET_CAPS;
-    caps.hdr.cParms      = SHCRGL_CPARMS_GET_CAPS;
+    caps.hdr.u32Function = SHCRGL_GUEST_FN_GET_CAPS_LEGACY;
+    caps.hdr.cParms      = SHCRGL_CPARMS_GET_CAPS_LEGACY;
 
     caps.Caps.type       = VMMDevHGCMParmType_32bit;
@@ -1321 +1321 @@
     return rc;
 }
-
 
 static int crVBoxHGCMSetPID(CRConnection *conn, unsigned long long pid)
@@ -1445 +1444 @@
             if (!g_crvboxhgcm.fHostCapsInitialized)
             {
-                rc = crVBoxHGCMGetHostCaps(conn, &g_crvboxhgcm.u32HostCaps);
+                rc = crVBoxHGCMGetHostCapsLegacy(conn, &g_crvboxhgcm.u32HostCaps);
                 if (RT_FAILURE(rc))
                 {