Changeset 76253 in vbox for trunk

Timestamp:

Dec 16, 2018 3:01:28 PM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d: dynamic loading of OpenGL: use function pointer type

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-glLdr.cpp (modified) (5 diffs)
• DevVGA-SVGA3d-glLdr.h (modified) (2 diffs)
• DevVGA-SVGA3d-ogl.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp

@@ -82 +82 @@
 #else
 # define OGLGETPROCADDRESS MyGLXGetProcAddress
-static void *MyGLXGetProcAddress(const char *pszSymbol)
+static PFNRT MyGLXGetProcAddress(const char *pszSymbol)
 {
     int rc;
@@ -99 +99 @@
     }
 
-    typedef void * (* PFNGLXGETPROCADDRESS)(const GLubyte * procName);
+    typedef PFNRT (* PFNGLXGETPROCADDRESS)(const GLubyte * procName);
     static PFNGLXGETPROCADDRESS s_glXGetProcAddress = NULL;
     if (s_glXGetProcAddress == NULL)
@@ -112 +112 @@
     }
 
-    void *p = s_glXGetProcAddress((const GLubyte *)pszSymbol);
+    PFNRT p = s_glXGetProcAddress((const GLubyte *)pszSymbol);
     if (RT_VALID_PTR(p))
         return p;
@@ -126 +126 @@
 
 #define GLGETPROC_(ProcName, NameSuffix) do { \
-    *(void **)&pfn_##ProcName = OGLGETPROCADDRESS(#ProcName NameSuffix); \
+    *(PFNRT *)&pfn_##ProcName = OGLGETPROCADDRESS(#ProcName NameSuffix); \
     AssertLogRelMsgReturn(pfn_##ProcName, ("%s missing\n", #ProcName NameSuffix), VERR_NOT_IMPLEMENTED); \
 } while(0)
@@ -289 +289 @@
 }
 
-void *glLdrGetProcAddress(const char *pszSymbol)
+PFNRT glLdrGetProcAddress(const char *pszSymbol)
 {
     return OGLGETPROCADDRESS(pszSymbol);

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h

@@ -22 +22 @@
 # error "This include file is for VMSVGA3D_OPENGL."
 #endif
+
+#include <iprt/types.h>
 
 /** @todo VBOX_VMSVGA3D_GL_HACK_LEVEL is not necessary when dynamic loading is used. */
@@ -79 +81 @@
 int glLdrInit(void);
 /* Resolve an OpenGL function name. */
-void *glLdrGetProcAddress(const char *pszSymbol);
+PFNRT glLdrGetProcAddress(const char *pszSymbol);
 /* Get pointers to extension function. They are available on Windows only when OpenGL context is set. */
 int glLdrGetExtFunctions(void);

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -65 +65 @@
 
 #ifdef VMSVGA3D_DYNAMIC_LOAD
-# define OGLGETPROCADDRESS(x)   glLdrGetProcAddress(x)
+# define OGLGETPROCADDRESS glLdrGetProcAddress
 #else
 #ifdef RT_OS_WINDOWS