Changeset 3513 in vbox

Timestamp:

Jul 9, 2007 4:20:50 PM (18 years ago)

Author:

vboxsync

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

22732

Message:

filter out opengl extensions, that we don't support (yet)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL

Files:

• VBoxOGL.cpp (modified) (7 diffs)
• VBoxOGL.h (modified) (4 diffs)
• glext.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.cpp

@@ -24 +24 @@
 #include <stdio.h>
 
-#define VBOX_INIT_CALL(a, b, c)                 \
-    (a)->result      = VINF_SUCCESS;            \
-    (a)->u32ClientID = (c)->u32ClientID;        \
-    (a)->u32Function = VBOXOGL_FN_##b;          \
-    (a)->cParms      = VBOXOGL_CPARMS_##b
-
 
        HINSTANCE    hDllVBoxOGL                 = 0;
 static DWORD        dwOGLTlsIndex               = TLS_OUT_OF_INDEXES;
 static VBOX_OGL_CTX vboxOGLCtx                  = {0};
-static char         szOpenGLVersion[256]        = "";
-static char         szOpenGLExtensions[8192]    = ""; /* this one can be rather long */
+       char         szOpenGLVersion[256]        = "";
+       char         szOpenGLExtensions[8192]    = ""; /* this one can be rather long */
 
 
@@ -188 +182 @@
     parms.pString.u.Pointer.u.linearAddr = (vmmDevHypPtr)szOpenGLVersion;
 
-    int rc = vboxHGCMCall(vboxOGLCtx.hGuestDrv, &parms, sizeof (parms));
+    int rc = vboxHGCMCall(&parms, sizeof (parms));
 
     if (    VBOX_FAILURE(rc)
@@ -198 +192 @@
     DbgPrintf(("GL_VERSION=%s\n", szOpenGLVersion));
 
-    memset(&parms, 0, sizeof(parms));
-    VBOX_INIT_CALL(&parms.hdr, GLGETSTRING, pCtx);
-
-    parms.name.type                      = VMMDevHGCMParmType_32bit;
-    parms.name.u.value32                 = GL_EXTENSIONS;
-    parms.pString.type                   = VMMDevHGCMParmType_LinAddr;
-    parms.pString.u.Pointer.size         = sizeof(szOpenGLExtensions);
-    parms.pString.u.Pointer.u.linearAddr = (vmmDevHypPtr)szOpenGLExtensions;
-
-    rc = vboxHGCMCall(vboxOGLCtx.hGuestDrv, &parms, sizeof (parms));
-
-    if (    VBOX_FAILURE(rc)
-        ||  VBOX_FAILURE(parms.hdr.result))
-    {
-        DbgPrintf(("GL_EXTENSIONS failed with %x %x\n", rc, parms.hdr.result));
-        return FALSE;
-    }
-    DbgPrintf(("GL_EXTENSIONS=%s\n\n", szOpenGLExtensions));
-
     /* Initialize OpenGL extensions */
-    vboxInitOpenGLExtensions();
+    vboxInitOpenGLExtensions(pCtx);
 
     return TRUE;
@@ -275 +250 @@
  *
  * @return VBox status code
- * @param   hDriver     Driver handle
  * @param   pvData      Data pointer
  * @param   cbData      Data size
  */
-int vboxHGCMCall(HANDLE hDriver, void *pvData, unsigned cbData)
+int vboxHGCMCall(void *pvData, unsigned cbData)
 {
     DWORD cbReturned;
 
-    if (DeviceIoControl (hDriver,
+    if (DeviceIoControl (vboxOGLCtx.hGuestDrv,
                          IOCTL_VBOXGUEST_HGCM_CALL,
                          pvData, cbData,
@@ -391 +365 @@
     parms.lasterror.u.value32               = 0;
 
-    int rc = vboxHGCMCall(vboxOGLCtx.hGuestDrv, &parms, sizeof (parms));
+    int rc = vboxHGCMCall(&parms, sizeof (parms));
 
     /* reset command buffer */
@@ -453 +427 @@
     }
 
-    int rc = vboxHGCMCall(vboxOGLCtx.hGuestDrv, &parms, sizeof (parms));
+    int rc = vboxHGCMCall(&parms, sizeof (parms));
 
     /* reset command buffer */
@@ -491 +465 @@
     parms.pszExtFnName.u.Pointer.u.linearAddr = (vmmDevHypPtr)pszExtFunctionName;
 
-    int rc = vboxHGCMCall(vboxOGLCtx.hGuestDrv, &parms, sizeof (parms));
+    int rc = vboxHGCMCall(&parms, sizeof (parms));
 
     if (    VBOX_FAILURE(rc)

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.h

@@ -47 +47 @@
 
 } VBOX_OGL_CTX, *PVBOX_OGL_CTX;
+
+/* HGCM macro */
+#define VBOX_INIT_CALL(a, b, c)                 \
+    (a)->result      = VINF_SUCCESS;            \
+    (a)->u32ClientID = (c)->u32ClientID;        \
+    (a)->u32Function = VBOXOGL_FN_##b;          \
+    (a)->cParms      = VBOXOGL_CPARMS_##b
 
 /* glDrawElement internal state */
@@ -84 +91 @@
 
 extern HINSTANCE hDllVBoxOGL;
+extern char      szOpenGLVersion[256];
+extern char      szOpenGLExtensions[8192];
 
 void APIENTRY glSetError(GLenum glNewError);
@@ -189 +198 @@
  *
  * @return VBox status code
- * @param   hDriver     Driver handle
  * @param   pvData      Data pointer
  * @param   cbData      Data size
  */
-int vboxHGCMCall(HANDLE hDriver, void *pvData, unsigned cbData);
+int vboxHGCMCall(void *pvData, unsigned cbData);
 
 #ifdef DEBUG
@@ -227 +235 @@
  *
  * @returns VBox status code
- */
-int vboxInitOpenGLExtensions();
+ * @param pCtx  OpenGL thread context
+ */
+int vboxInitOpenGLExtensions(PVBOX_OGL_THREAD_CTX pCtx);
 
 /**

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/glext.cpp

@@ -28 +28 @@
 
 
-int vboxInitOpenGLExtensions()
+/**
+ * Initialize OpenGL extensions
+ *
+ * @returns VBox status code
+ * @param pCtx  OpenGL thread context
+ */
+int vboxInitOpenGLExtensions(PVBOX_OGL_THREAD_CTX pCtx)
 {
-    const GLubyte *pszExtensions = glGetString(GL_EXTENSIONS);
+    char *pszExtensions;
     static bool    fInitialized  = false;
+    VBoxOGLglGetString parms;
+    int rc;
+
+    memset(&parms, 0, sizeof(parms));
+    VBOX_INIT_CALL(&parms.hdr, GLGETSTRING, pCtx);
+
+    parms.name.type                      = VMMDevHGCMParmType_32bit;
+    parms.name.u.value32                 = GL_EXTENSIONS;
+    parms.pString.type                   = VMMDevHGCMParmType_LinAddr;
+    parms.pString.u.Pointer.size         = sizeof(szOpenGLExtensions);
+    parms.pString.u.Pointer.u.linearAddr = (vmmDevHypPtr)szOpenGLExtensions;
+
+    rc = vboxHGCMCall(&parms, sizeof (parms));
+
+    if (    VBOX_FAILURE(rc)
+        ||  VBOX_FAILURE(parms.hdr.result))
+    {
+        DbgPrintf(("GL_EXTENSIONS failed with %x %x\n", rc, parms.hdr.result));
+        return FALSE;
+    }
+    DbgPrintf(("GL_EXTENSIONS=%s\n\n", szOpenGLExtensions));
 
     if (fInitialized)
         return VINF_SUCCESS;
+
+    pszExtensions = strdup(szOpenGLExtensions);
+    szOpenGLExtensions[0] = 0;
 
     for (int i=0;i<RT_ELEMENTS(OpenGLExtensions);i++)
@@ -40 +70 @@
         if (strstr((char *)pszExtensions, OpenGLExtensions[i].pszExtName))
             OpenGLExtensions[i].fAvailable = VBoxIsExtensionAvailable(OpenGLExtensions[i].pszExtFunctionName);
+        
+        if (OpenGLExtensions[i].fAvailable)
+            strcat(szOpenGLExtensions, OpenGLExtensions[i].pszExtName);
     }
+
+    free(pszExtensions);
+
     fInitialized = true;
     return VINF_SUCCESS;