Changeset 76263 in vbox for trunk/src/VBox

Timestamp:

Dec 17, 2018 3:03:28 PM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d: dynamic loading of OpenGL: X11 too

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA3d-glLdr.cpp (modified) (3 diffs)
• Graphics/DevVGA-SVGA3d-glLdr.h (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)

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

@@ -124 +124 @@
     return NULL;
 }
+
+static PFNRT MyX11GetProcAddress(const char *pszSymbol)
+{
+    int rc;
+
+    static RTLDRMOD s_hX11 = NULL;
+    if (s_hX11 == NULL)
+    {
+        static const char s_szLibX11[] = "libX11.so.6";
+        rc = RTLdrLoadEx(s_szLibX11, &s_hX11, RTLDRLOAD_FLAGS_GLOBAL | RTLDRLOAD_FLAGS_NO_UNLOAD, NULL);
+        if (RT_FAILURE(rc))
+        {
+            LogRel(("VMSVGA3d: failed to load %s: %Rrc\n", s_szLibX11, rc));
+            s_hX11 = NULL;
+            return NULL;
+        }
+    }
+
+    PFNRT p = NULL;
+    rc = RTLdrGetSymbol(s_hX11, pszSymbol, (void **)&p);
+    if (RT_SUCCESS(rc))
+        return p;
+
+    return NULL;
+}
+
+#define X11GETPROC_(ProcName) do { \
+    *(PFNRT *)&pfn_##ProcName = pfnRet = MyX11GetProcAddress(#ProcName); \
+    if (pfnRet) { /* likely */ } \
+    else \
+    { \
+        AssertLogRelMsg(pfnRet, ("%s missing\n", #ProcName)); \
+        return PDMDevHlpVMSetError(pDevIns, VERR_VGA_GL_SYMBOL_NOT_FOUND, RT_SRC_POS, \
+                                   "Missing libX11 symbol '%s'\n", #ProcName); \
+    } \
+} while(0)
 #endif
 
@@ -223 +259 @@
     pfn_glXMakeCurrent = 0;
     pfn_glXDestroyContext = 0;
+    pfn_XConfigureWindow = 0;
+    pfn_XCloseDisplay = 0;
+    pfn_XCreateColormap = 0;
+    pfn_XCreateWindow = 0;
+    pfn_XDefaultRootWindow = 0;
+    pfn_XDestroyWindow = 0;
+    pfn_XNextEvent = 0;
+    pfn_XOpenDisplay = 0;
+    pfn_XPending = 0;
 #endif
 
@@ -300 +345 @@
     GLGETPROC_(glXMakeCurrent, "");
     GLGETPROC_(glXDestroyContext, "");
+    X11GETPROC_(XConfigureWindow);
+    X11GETPROC_(XCloseDisplay);
+    X11GETPROC_(XCreateColormap);
+    X11GETPROC_(XCreateWindow);
+    X11GETPROC_(XDefaultRootWindow);
+    X11GETPROC_(XDestroyWindow);
+    X11GETPROC_(XNextEvent);
+    X11GETPROC_(XOpenDisplay);
+    X11GETPROC_(XPending);
 #endif
     return VINF_SUCCESS;

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

@@ -328 +328 @@
 #define glXDestroyContext pfn_glXDestroyContext
 
-#endif
-
-#endif
+/*
+ * X11
+ */
+GLPFN int (* pfn_XConfigureWindow)(Display *display, Window w, unsigned value_mask, XWindowChanges *changes);
+#define XConfigureWindow pfn_XConfigureWindow
+
+GLPFN int (* pfn_XCloseDisplay)(Display *display);
+#define XCloseDisplay pfn_XCloseDisplay
+
+GLPFN Colormap (* pfn_XCreateColormap)(Display *display, Window w, Visual *visual, int alloc);
+#define XCreateColormap pfn_XCreateColormap
+
+GLPFN Window (* pfn_XCreateWindow)(Display *display, Window parent, int x, int y, unsigned int width, unsigned int height,
+    unsigned int border_width, int depth, unsigned int window_class, Visual *visual, unsigned long valuemask, XSetWindowAttributes *attributes);
+#define XCreateWindow pfn_XCreateWindow
+
+GLPFN Window (* pfn_XDefaultRootWindow)(Display *display);
+#define XDefaultRootWindow pfn_XDefaultRootWindow
+
+GLPFN int (* pfn_XDestroyWindow)(Display *display, Window w);
+#define XDestroyWindow pfn_XDestroyWindow
+
+GLPFN int (* pfn_XNextEvent)(Display *display, XEvent *event_return); 
+#define XNextEvent pfn_XNextEvent
+
+GLPFN Display *(* pfn_XOpenDisplay)(char *display_name);
+#define XOpenDisplay pfn_XOpenDisplay
+
+GLPFN int (* pfn_XPending)(Display *display);
+#define XPending pfn_XPending
+
+#endif
+
+#endif

trunk/src/VBox/Devices/Makefile.kmk

@@ -311 +311 @@
         $(VBOX_DEF_2_LAZY_LOAD) --explicit-load-function --library VBoxSVGA3DObjC --output "$@" $(filter %.def, $^)
 
-   # VBoxDD_LIBS.linux    += X11
    ifdef VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD
    VBoxDD_DEFS          += VMSVGA3D_DYNAMIC_LOAD
@@ -317 +316 @@
         Graphics/DevVGA-SVGA3d-glLdr.cpp
    else
-   VBoxDD_LIBS.linux    += GL
+   VBoxDD_LIBS.linux    += X11 GL
    VBoxDD_LIBS.win      += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    endif