gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix EGL compilation

This commit is contained in:
Eduardo Bart 2012-04-12 17:00:08 -03:00
parent 0b8d8b4595
commit 9b4115a7e5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/framework/platform/x11window.cpp
View File

@ -29,7 +29,6 @@
X11Window::X11Window() X11Window::X11Window()
{ {
m_fbConfig = 0;
m_display = 0; m_display = 0;
m_visual = 0; m_visual = 0;
m_window = 0; m_window = 0;
@ -43,6 +42,7 @@ X11Window::X11Window()
m_size = Size(600,480); m_size = Size(600,480);
#ifndef OPENGL_ES2 #ifndef OPENGL_ES2
m_fbConfig = 0;
m_glxContext = 0; m_glxContext = 0;
#else #else
m_eglConfig = 0; m_eglConfig = 0;
@ -419,7 +419,6 @@ void X11Window::internalCreateGLContext()
#endif #endif
m_glxContext = glXCreateContext(m_display, m_visual, NULL, True); m_glxContext = glXCreateContext(m_display, m_visual, NULL, True);
//m_glxContext = glXCreateContext(m_display, m_visual, NULL, True);
if(!m_glxContext) if(!m_glxContext)
logFatal("Unable to create GLX context"); logFatal("Unable to create GLX context");
@ -481,7 +480,7 @@ void *X11Window::getExtensionProcAddress(const char *ext)
return (void *)glXGetProcAddressARB((const GLubyte*)ext); return (void *)glXGetProcAddressARB((const GLubyte*)ext);
#else #else
//TODO //TODO
return false; return NULL;
#endif #endif
} }

2
src/framework/platform/x11window.h
View File

@ -82,7 +82,6 @@ public:
bool isMaximized(); bool isMaximized();
private: private:
GLXFBConfig *m_fbConfig;
Display *m_display; Display *m_display;
XVisualInfo *m_visual; XVisualInfo *m_visual;
Window m_window; Window m_window;
@ -97,6 +96,7 @@ private:
#ifndef OPENGL_ES2 #ifndef OPENGL_ES2
GLXContext m_glxContext; GLXContext m_glxContext;
GLXFBConfig *m_fbConfig;
#else #else
EGLConfig m_eglConfig; EGLConfig m_eglConfig;
EGLContext m_eglContext; EGLContext m_eglContext;