Cleanup glproc.

[apitrace] / glws_egl_xlib.cpp

diff --git a/glws_egl_xlib.cpp b/glws_egl_xlib.cpp
index 3e2d9a617cbd5b0a0066a8596d5ed67a9c2eb79c..eb284ab031ea198053ffb384f29089657146e671 100644 (file)
--- a/glws_egl_xlib.cpp
+++ b/glws_egl_xlib.cpp
@@ -29,9 +29,10 @@
 
 #include <iostream>
 
-#include "glws.hpp"
+#include <dlfcn.h>
 
 #include "glproc.hpp"
+#include "glws.hpp"
 
 
 namespace glws {
@@ -94,7 +95,7 @@ public:
     EglDrawable(const Visual *vis, int w, int h) :
         Drawable(vis, w, h), api(EGL_OPENGL_ES_API)
     {
-        XVisualInfo *visinfo = dynamic_cast<const EglVisual *>(visual)->visinfo;
+        XVisualInfo *visinfo = static_cast<const EglVisual *>(visual)->visinfo;
 
         Window root = RootWindow(display, screen);
 
@@ -135,7 +136,7 @@ public:
 
         eglWaitNative(EGL_CORE_NATIVE_ENGINE);
 
-        EGLConfig config = dynamic_cast<const EglVisual *>(visual)->config;
+        EGLConfig config = static_cast<const EglVisual *>(visual)->config;
         surface = eglCreateWindowSurface(eglDisplay, config, window, NULL);
     }
 
@@ -229,6 +230,13 @@ init(void) {
 
     screen = DefaultScreen(display);
 
+    __libGlHandle = dlopen("libEGL.so", RTLD_GLOBAL | RTLD_LAZY);
+    if (!__libGlHandle) {
+        std::cerr << "error: unable to open libEGL.so\n";
+        XCloseDisplay(display);
+        exit(1);
+    }
+
     eglDisplay = eglGetDisplay(display);
     if (eglDisplay == EGL_NO_DISPLAY) {
         std::cerr << "error: unable to get EGL display\n";
@@ -307,13 +315,13 @@ createDrawable(const Visual *visual, int width, int height)
 Context *
 createContext(const Visual *_visual, Context *shareContext, Profile profile)
 {
-    const EglVisual *visual = dynamic_cast<const EglVisual *>(_visual);
+    const EglVisual *visual = static_cast<const EglVisual *>(_visual);
     EGLContext share_context = EGL_NO_CONTEXT;
     EGLContext context;
     Attributes<EGLint> attribs;
 
     if (shareContext) {
-        share_context = dynamic_cast<EglContext*>(shareContext)->context;
+        share_context = static_cast<EglContext*>(shareContext)->context;
     }
 
     EGLint api = eglQueryAPI();
@@ -348,8 +356,8 @@ makeCurrent(Drawable *drawable, Context *context)
     if (!drawable || !context) {
         return eglMakeCurrent(eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
     } else {
-        EglDrawable *eglDrawable = dynamic_cast<EglDrawable *>(drawable);
-        EglContext *eglContext = dynamic_cast<EglContext *>(context);
+        EglDrawable *eglDrawable = static_cast<EglDrawable *>(drawable);
+        EglContext *eglContext = static_cast<EglContext *>(context);
         EGLBoolean ok;
 
         ok = eglMakeCurrent(eglDisplay, eglDrawable->surface,