1 files changed, 4 insertions, 9 deletions

diff --git a/src/mgl.c b/src/mgl.c
index 27d33ae..02ed363 100644
--- a/src/mgl.c
+++ b/src/mgl.c
@@ -44,13 +44,13 @@ static int glx_context_init() {
         None
     };
 
-    context.visual_info = context.glx.glXChooseVisual(context.connection, DefaultScreen(context.connection), (int*)attr);
+    context.visual_info = context.gl.glXChooseVisual(context.connection, DefaultScreen(context.connection), (int*)attr);
     if(!context.visual_info) {
         fprintf(stderr, "glXChooseVisual failed, no appropriate visual found\n");
         return -1;
     }
 
-    context.glx_context = context.glx.glXCreateContext(context.connection, context.visual_info, NULL, 1);
+    context.glx_context = context.gl.glXCreateContext(context.connection, context.visual_info, NULL, 1);
     if(!context.glx_context) {
         fprintf(stderr, "glXCreateContext failed\n");
         return -1;
@@ -61,7 +61,7 @@ static int glx_context_init() {
 
 static void glx_context_deinit() {
     if(context.glx_context) {
-        context.glx.glXDestroyContext(context.connection, context.glx_context);
+        context.gl.glXDestroyContext(context.connection, context.glx_context);
         context.glx_context = NULL;
     }
 
@@ -83,11 +83,6 @@ int mgl_init(void) {
 
         prev_xerror = XSetErrorHandler(ignore_xerror);
 
-        if(mgl_glx_load(&context.glx) != 0) {
-            mgl_deinit();
-            return -1;
-        }
-
         if(mgl_gl_load(&context.gl) != 0) {
             mgl_deinit();
             return -1;
@@ -105,7 +100,7 @@ void mgl_deinit(void) {
     if(init_count == 1) {
         glx_context_deinit();
         mgl_gl_unload(&context.gl);
-        mgl_glx_unload(&context.glx);
+        mgl_gl_unload(&context.gl);
         XSetErrorHandler(prev_xerror);
         if(context.connection) {
             XCloseDisplay(context.connection);