commit a36c990ca735dcd8f48a077e867ed44377e897ed
author Nicolas Capens <nicolascapens@google.com> Mon Apr 13 03:51:45 2015 -0400
committer Nicolas Capens <capn@google.com> Mon Apr 13 16:58:44 2015 +0000
tree 28778da7bafc6a6c5441755d5bd4fa1958253116
parent 83083ecf6fde8a2430cfb6980ef05d6c88a03d52

Manually load X11 and resolve its symbols when needed.

This removes the static dependency on X11 on Linux, allowing for
headless rendering on systems without it.

Bug 20104157

Change-Id: I463c8b3340c3ad16cd0f0d1d0f8804ee31012dd0
Reviewed-on: https://swiftshader-review.googlesource.com/2832
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/Main/libX11.cpp

diff --git a/src/Main/libX11.cpp b/src/Main/libX11.cpp
new file mode 100644
index 0000000..ebd76ff
--- /dev/null
+++ b/src/Main/libX11.cpp
@@ -0,0 +1,48 @@
+#include "libX11.hpp"
+
+#include "Common/SharedLibrary.hpp"
+
+#define Bool int
+
+LibX11exports::LibX11exports(void *libX11, void *libXext)
+{
+    XOpenDisplay = (Display *(*)(char*))getProcAddress(libX11, "XOpenDisplay");
+    XGetWindowAttributes = (Status (*)(Display*, Window, XWindowAttributes*))getProcAddress(libX11, "XGetWindowAttributes");
+    XDefaultScreenOfDisplay = (Screen *(*)(Display*))getProcAddress(libX11, "XDefaultScreenOfDisplay");
+    XWidthOfScreen = (int (*)(Screen*))getProcAddress(libX11, "XWidthOfScreen");
+    XHeightOfScreen = (int (*)(Screen*))getProcAddress(libX11, "XHeightOfScreen");
+    XPlanesOfScreen = (int (*)(Screen*))getProcAddress(libX11, "XPlanesOfScreen");
+    XDefaultGC = (GC (*)(Display*, int))getProcAddress(libX11, "XDefaultGC");
+    XDefaultDepth = (int (*)(Display*, int))getProcAddress(libX11, "XDefaultDepth");
+    XMatchVisualInfo = (Status (*)(Display*, int, int, int, XVisualInfo*))getProcAddress(libX11, "XMatchVisualInfo");
+    XDefaultVisual = (Visual *(*)(Display*, int screen_number))getProcAddress(libX11, "XDefaultVisual");
+    XSetErrorHandler = (int (*(*)(int (*)(Display*, XErrorEvent*)))(Display*, XErrorEvent*))getProcAddress(libX11, "XSetErrorHandler");
+    XSync = (int (*)(Display*, Bool))getProcAddress(libX11, "XSync");
+    XCreateImage = (XImage *(*)(Display*, Visual*, unsigned int, int, int, char*, unsigned int, unsigned int, int, int))getProcAddress(libX11, "XCreateImage");
+    XCloseDisplay = (int (*)(Display*))getProcAddress(libX11, "XCloseDisplay");
+    XPutImage = (int (*)(Display*, Drawable, GC, XImage*, int, int, int, int, unsigned int, unsigned int))getProcAddress(libX11, "XPutImage");
+
+    XShmQueryExtension = (Bool (*)(Display*))getProcAddress(libXext, "XShmQueryExtension");
+    XShmCreateImage = (XImage *(*)(Display*, Visual*, unsigned int, int, char*, XShmSegmentInfo*, unsigned int, unsigned int))getProcAddress(libXext, "XShmCreateImage");
+    XShmAttach = (Bool (*)(Display*, XShmSegmentInfo*))getProcAddress(libXext, "XShmAttach");
+    XShmDetach = (Bool (*)(Display*, XShmSegmentInfo*))getProcAddress(libXext, "XShmDetach");
+    XShmPutImage = (int (*)(Display*, Drawable, GC, XImage*, int, int, int, int, unsigned int, unsigned int, bool))getProcAddress(libXext, "XShmPutImage");
+}
+
+LibX11exports *LibX11::operator->()
+{
+    static void *libX11 = nullptr;
+    static void *libXext = nullptr;
+    static LibX11exports *libX11exports = nullptr;
+
+    if(!libX11)
+    {
+        libX11 = loadLibrary("libX11.so");
+        libXext = loadLibrary("libXext.so");
+        libX11exports = new LibX11exports(libX11, libXext);
+    }
+
+    return libX11exports;
+}
+
+LibX11 libX11;