Changeset 76247 in vbox

Timestamp:

Dec 15, 2018 10:53:09 PM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d: more for dynamic loading of opengl

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-glLdr.cpp (modified) (3 diffs)
• DevVGA-SVGA3d-glLdr.h (modified) (1 diff)

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

@@ -109 +109 @@
     if (s_glXGetProcAddress)
     {
-        return glXGetProcAddress((const GLubyte *)pszSymbol);
+        void *p = glXGetProcAddress((const GLubyte *)pszSymbol);
+        if (RT_VALID_PTR(p))
+            return p;
+
+        /* Might be an exported symbol. */
+        rc = RTLdrGetSymbol(s_hGL, pszSymbol, (void **)&p);
+        if (RT_SUCCESS(rc))
+            return p;
     }
 
@@ -189 +196 @@
     pfn_glVertexPointer = 0;
     pfn_glViewport = 0;
+#ifdef RT_OS_WINDOWS
+    pfn_wglCreateContext = 0;
+    pfn_wglDeleteContext = 0;
+    pfn_wglMakeCurrent = 0;
+    pfn_wglShareLists = 0;
+#elif defined(RT_OS_LINUX)
+    pfn_glXQueryVersion = 0;
+    pfn_glXChooseVisual = 0;
+    pfn_glXCreateContext = 0;
+    pfn_glXMakeCurrent = 0;
+    pfn_glXDestroyContext = 0;
+#endif
 
     GLGETPROC_(glAlphaFunc, "");
@@ -258 +277 @@
     GLGETPROC_(wglMakeCurrent, "");
     GLGETPROC_(wglShareLists, "");
+#elif defined(RT_OS_LINUX)
+    GLGETPROC_(glXQueryVersion, "");
+    GLGETPROC_(glXChooseVisual, "");
+    GLGETPROC_(glXCreateContext, "");
+    GLGETPROC_(glXMakeCurrent, "");
+    GLGETPROC_(glXDestroyContext, "");
 #endif
     return VINF_SUCCESS;

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

@@ -306 +306 @@
 GLPFN BOOL (WINAPI *pfn_wglShareLists)(HGLRC, HGLRC);
 #define wglShareLists pfn_wglShareLists
-#endif
-
-#endif
+
+#elif defined(RT_OS_LINUX)
+/*
+ * GLX
+ */
+GLPFN Bool (* pfn_glXQueryVersion)(Display * dpy,  int * major,  int * minor);
+#define glXQueryVersion pfn_glXQueryVersion
+
+GLPFN XVisualInfo* (* pfn_glXChooseVisual)(Display * dpy,  int screen,  int * attribList);
+#define glXChooseVisual pfn_glXChooseVisual
+
+GLPFN GLXContext (* pfn_glXCreateContext)(Display * dpy,  XVisualInfo * vis,  GLXContext shareList,  Bool direct);
+#define glXCreateContext pfn_glXCreateContext
+
+GLPFN Bool (* pfn_glXMakeCurrent)(Display * dpy,  GLXDrawable drawable,  GLXContext ctx);
+#define glXMakeCurrent pfn_glXMakeCurrent
+
+GLPFN void (* pfn_glXDestroyContext)(Display * dpy,  GLXContext ctx);
+#define glXDestroyContext pfn_glXDestroyContext
+
+#endif
+
+#endif