Changeset 3460

Timestamp:

07/05/07 14:56:04 (2 years ago)

Author:

vboxsync

Message:

Extension checks

Files:

• trunk/include/VBox/HostServices/VBoxOpenGLSvc.h (modified) (2 diffs)
• trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.cpp (modified) (1 diff)
• trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.h (modified) (1 diff)
• trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/drv.cpp (modified) (1 diff)
• trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/glext.cpp (modified) (2 diffs)
• trunk/src/VBox/HostServices/SharedOpenGL/gldrv.h (modified) (1 diff)
• trunk/src/VBox/HostServices/SharedOpenGL/gllindrv.cpp (modified) (1 diff)
• trunk/src/VBox/HostServices/SharedOpenGL/glwindrv.cpp (modified) (1 diff)
• trunk/src/VBox/HostServices/SharedOpenGL/service.cpp (modified) (1 diff)

trunk/include/VBox/HostServices/VBoxOpenGLSvc.h

@@ -66 +66 @@
-#define VBOXOGL_FN_GLFLUSH              (2)
-#define VBOXOGL_FN_GLFLUSHPTR           (3)
+#define VBOXOGL_FN_GLCHECKEXT           (4)
-
-/** @} */
@@ -171 +172 @@
-#define VBOXOGL_CPARMS_GLFLUSHPTR (5)
-
+
+/**
+ * VBOXOGL_FN_GLCHECKEXT
+ */
+
+/** Parameters structure. */
+typedef struct
+{
+    VBoxGuestHGCMCallInfo   hdr;
+
+    /** pointer, in
+     * Extension function name
+     */
+    HGCMFunctionParameter   pszExtFnName;
+
+} VBoxOGLglCheckExt;
+
+/** Number of parameters */
+#define VBOXOGL_CPARMS_GLCHECKEXT (1)
+
-/** @} */
-

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

@@ -470 +470 @@
-    return parms.retval.u.value64;
-}
+
+/**
+ * Check if an OpenGL extension is available on the host
+ *
+ * @returns available or not
+ * @param   pszExtFunctionName  
+ */
+bool VBoxIsExtensionAvailable(const char *pszExtFunctionName)
+{
+    PVBOX_OGL_THREAD_CTX pCtx = VBoxOGLGetThreadCtx();
+    VBoxOGLglCheckExt parms;
+
+    AssertReturn(pCtx->pCurrentCmd > pCtx->pCmdBuffer, 0);
+
+    VBOX_INIT_CALL(&parms.hdr, GLCHECKEXT, pCtx);
+
+    parms.pszExtFnName.type                   = VMMDevHGCMParmType_LinAddr_In;
+    parms.pszExtFnName.u.Pointer.size         = strlen(pszExtFunctionName)+1;
+    parms.pszExtFnName.u.Pointer.u.linearAddr = (vmmDevHypPtr)pszExtFunctionName;
+
+    int rc = vboxHGCMCall(vboxOGLCtx.hGuestDrv, &parms, sizeof (parms));
+
+    if (    VBOX_FAILURE(rc)
+        ||  VBOX_FAILURE(parms.hdr.result))
+    {
+        DbgPrintf(("GLCHECKEXT failed with %x %x\n", rc, parms.hdr.result));
+        return false;
+    }
+
+    return true;
+}

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

@@ -198 +198 @@
-
-/**
+ * Check if an OpenGL extension is available on the host
+ *
+ * @returns available or not
+ * @param   pszExtFunctionName  
+ */
+bool VBoxIsExtensionAvailable(const char *pszExtFunctionName);
+
+/**
- * Query the specified cached parameter
- * 

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

@@ -64 +64 @@
-
-
-
-PROC APIENTRY DrvGetProcAddress(LPCSTR lpszProc)
-{
-    PROC pfnProc = GetProcAddress(hDllVBoxOGL, lpszProc);
-    if (pfnProc == NULL)
-        DbgPrintf(("DrvGetProcAddress %s FAILED\n", lpszProc));
-    else
-        DbgPrintf(("DrvGetProcAddress %s\n", lpszProc));
-
-    return pfnProc;
-}
-
-BOOL APIENTRY DrvValidateVersion(DWORD version)

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

@@ -25 +25 @@
-
-#include "VBoxOGL.h"
+#define WGL_WGLEXT_PROTOTYPES
-#include <VBox/HostServices/wglext.h>
+
+typedef struct
+{
+    const char *pszExtName;
+    const char *pszExtFunctionName;
+    RTUINTPTR   pfnFunction;
+    bool        fAvailable;
+} OPENGL_EXT, *POPENGL_EXT;
+
+static OPENGL_EXT OpenGLExtensions[] = 
+{
+    {   "WGL_EXT_swap_control",             "wglSwapIntervalEXT",               (RTUINTPTR)wglSwapIntervalEXT,                      false },
+    {   "WGL_EXT_swap_control",             "wglGetSwapIntervalEXT",            (RTUINTPTR)wglGetSwapIntervalEXT,                   false },
+};
+
+
+int vboxInitOpenGLExtensions()
+{
+    const GLubyte *pszExtensions = glGetString(GL_EXTENSIONS);
+
+    for (int i=0;i<RT_ELEMENTS(OpenGLExtensions);i++)
+    {
+        if (strstr((char *)pszExtensions, OpenGLExtensions[i].pszExtFunctionName))
+            OpenGLExtensions[i].fAvailable = VBoxIsExtensionAvailable(OpenGLExtensions[i].pszExtFunctionName);
+    }
+    return VINF_SUCCESS;
+}
+
+
+PROC APIENTRY DrvGetProcAddress(LPCSTR lpszProc)
+{
+    PROC pfnProc;
+
+    for (int i=0;i<RT_ELEMENTS(OpenGLExtensions);i++)
+    {
+        if (    OpenGLExtensions[i].fAvailable
+            && !strcmp(OpenGLExtensions[i].pszExtFunctionName, lpszProc))
+        {
+            pfnProc = (PROC)OpenGLExtensions[i].pfnFunction;
+        }
+    }
+    if (pfnProc == NULL)
+        DbgPrintf(("DrvGetProcAddress %s FAILED\n", lpszProc));
+    else
+        DbgPrintf(("DrvGetProcAddress %s\n", lpszProc));
+
+    return pfnProc;
+}
+
+BOOL WINAPI wglSwapIntervalEXT(int interval)
+{
+    VBOX_OGL_GEN_SYNC_OP1_RET(BOOL, wglSwapIntervalEXT, interval);
+    return retval;
+}
+
+int WINAPI wglGetSwapIntervalEXT(void)
+{
+    VBOX_OGL_GEN_SYNC_OP_RET(int, wglGetSwapIntervalEXT);
+    return retval;
+}
+
+
+
+
-
-#if 0
@@ -104 +169 @@
- GL_WIN_swap_hint 
- WGL_EXT_extensions_string 
- WGL_EXT_swap_control 
-#endif
-
-
-BOOL WINAPI wglSwapIntervalEXT(int interval)
-{
-    VBOX_OGL_GEN_SYNC_OP1_RET(BOOL, wglSwapIntervalEXT, interval);
-    return retval;
-}
-
-int WINAPI wglGetSwapIntervalEXT(void)
-{
-    VBOX_OGL_GEN_SYNC_OP_RET(int, wglGetSwapIntervalEXT);
-    return retval;
-}
-

trunk/src/VBox/HostServices/SharedOpenGL/gldrv.h

@@ -150 +150 @@
-void vboxglDrvSwapBuffers(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer);
-
+bool vboxDrvIsExtensionAvailable(char *pszExtFunctionName);
+
-#endif /* __VBOXGLWIN__H */

trunk/src/VBox/HostServices/SharedOpenGL/gllindrv.cpp

@@ -216 +216 @@
-    pClient->lastretval = 0; /** @todo */
-}
+
+bool vboxDrvIsExtensionAvailable(char *pszExtFunctionName)
+{
+    return false;
+}
+

trunk/src/VBox/HostServices/SharedOpenGL/glwindrv.cpp

@@ -416 +416 @@
-        ReleaseDC(0, pClient->hdc);
-}
+
+bool vboxDrvIsExtensionAvailable(char *pszExtFunctionName)
+{
+    return !!wglGetProcAddress(pszExtFunctionName);
+}

trunk/src/VBox/HostServices/SharedOpenGL/service.cpp

@@ -257 +257 @@
-        } 
-
+        case VBOXOGL_FN_GLCHECKEXT:
+        {
+            Log(("svcCall: VBOXOGL_FN_GLCHECKEXT\n"));
+
+            /* Verify parameter count and types. */
+            if (cParms != VBOXOGL_CPARMS_GLCHECKEXT)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else 
+            if (    paParms[0].type != VBOX_HGCM_SVC_PARM_PTR       /* pszExtFnName */
+               )
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                /* Fetch parameters. */
+                char    *pszExtFnName = (char *)paParms[0].u.pointer.addr;
+                uint32_t cbExtFnName  = paParms[0].u.pointer.size;
+
+                /* sanity checks */
+                if (    cbExtFnName > 256
+                    ||  pszExtFnName[cbExtFnName-1] != 0
+                   )
+                {
+                    rc = VERR_INVALID_PARAMETER;
+                }
+                else
+                {
+                    /* Execute the function. */
+                    if (vboxDrvIsExtensionAvailable(pszExtFnName))
+                        rc = VINF_SUCCESS;
+                    else
+                        rc = VERR_FILE_NOT_FOUND;
+
+                    if (VBOX_SUCCESS(rc))
+                    {
+                        /* Update parameters.*/
+                    }
+                }
+            }
+            break;
+        } 
+
-        default:
-        {