Changeset 3472 in vbox

Timestamp:

Jul 5, 2007 2:55:58 PM (18 years ago)

Author:

vboxsync

Message:

Updates

Location:

trunk

Files:

• include/VBox/HostServices/VBoxOGLOp.h (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/glext.cpp (modified) (1 diff)

trunk/include/VBox/HostServices/VBoxOGLOp.h

@@ -1861 +1861 @@
     const char *pszExtName;
     const char *pszExtFunctionName;
+#ifdef VBOX_OGL_GUEST_SIDE
     RTUINTPTR   pfnFunction;
+#else
+    RTUINTPTR  *ppfnFunction;
+#endif
     bool        fAvailable;
 } OPENGL_EXT, *POPENGL_EXT;
 
 #ifdef VBOX_OGL_GUEST_SIDE
-#define VBOX_OGL_EXTENSION(a)   a
+#define VBOX_OGL_EXTENSION(a)   (RTUINTPTR)a
 #else
-#define VBOX_OGL_EXTENSION(a)   pfn##a
+#define VBOX_OGL_EXTENSION(a)   (RTUINTPTR *)pfn##a
 
 static PFNWGLSWAPINTERVALEXTPROC        pfnwglSwapIntervalEXT       = NULL;
@@ -1877 +1881 @@
 static OPENGL_EXT OpenGLExtensions[] = 
 {
-    {   "WGL_EXT_swap_control",             "wglSwapIntervalEXT",               (RTUINTPTR)VBOX_OGL_EXTENSION(wglSwapIntervalEXT),                      false },
-    {   "WGL_EXT_swap_control",             "wglGetSwapIntervalEXT",            (RTUINTPTR)VBOX_OGL_EXTENSION(wglGetSwapIntervalEXT),                   false },
+    {   "WGL_EXT_swap_control",             "wglSwapIntervalEXT",               VBOX_OGL_EXTENSION(wglSwapIntervalEXT),                      false },
+    {   "WGL_EXT_swap_control",             "wglGetSwapIntervalEXT",            VBOX_OGL_EXTENSION(wglGetSwapIntervalEXT),                   false },
 };
 #endif /* VBOX_OGL_WITH_EXTENSION_ARRAY */

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

@@ -48 +48 @@
         if (strstr((char *)pszExtensions, OpenGLExtensions[i].pszExtName))
         {
-            OpenGLExtensions[i].pfnFunction = vboxDrvIsExtensionAvailable((char *)OpenGLExtensions[i].pszExtFunctionName);
-            OpenGLExtensions[i].fAvailable  = !!OpenGLExtensions[i].pfnFunction;
+            *OpenGLExtensions[i].ppfnFunction = vboxDrvIsExtensionAvailable((char *)OpenGLExtensions[i].pszExtFunctionName);
+            OpenGLExtensions[i].fAvailable   = !!*OpenGLExtensions[i].ppfnFunction;
         }
     }