From 9b4115a7e528c5e8772fc847d08a306f92d8afad Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Thu, 12 Apr 2012 17:00:08 -0300
Subject: [PATCH] fix EGL compilation

---
 src/framework/platform/x11window.cpp | 5 ++---
 src/framework/platform/x11window.h   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp
index 492049c6..090e640c 100644
--- a/src/framework/platform/x11window.cpp
+++ b/src/framework/platform/x11window.cpp
@@ -29,7 +29,6 @@
 
 X11Window::X11Window()
 {
-    m_fbConfig = 0;
     m_display = 0;
     m_visual = 0;
     m_window = 0;
@@ -43,6 +42,7 @@ X11Window::X11Window()
     m_size = Size(600,480);
 
 #ifndef OPENGL_ES2
+    m_fbConfig = 0;
     m_glxContext = 0;
 #else
     m_eglConfig = 0;
@@ -419,7 +419,6 @@ void X11Window::internalCreateGLContext()
 #endif
         m_glxContext = glXCreateContext(m_display, m_visual, NULL, True);
 
-    //m_glxContext = glXCreateContext(m_display, m_visual, NULL, True);
     if(!m_glxContext)
         logFatal("Unable to create GLX context");
 
@@ -481,7 +480,7 @@ void *X11Window::getExtensionProcAddress(const char *ext)
     return (void *)glXGetProcAddressARB((const GLubyte*)ext);
 #else
     //TODO
-    return false;
+    return NULL;
 #endif
 }
 
diff --git a/src/framework/platform/x11window.h b/src/framework/platform/x11window.h
index 43b13b7b..4647854a 100644
--- a/src/framework/platform/x11window.h
+++ b/src/framework/platform/x11window.h
@@ -82,7 +82,6 @@ public:
     bool isMaximized();
 
 private:
-    GLXFBConfig *m_fbConfig;
     Display *m_display;
     XVisualInfo *m_visual;
     Window m_window;
@@ -97,6 +96,7 @@ private:
 
 #ifndef OPENGL_ES2
     GLXContext m_glxContext;
+    GLXFBConfig *m_fbConfig;
 #else
     EGLConfig m_eglConfig;
     EGLContext m_eglContext;