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

enable ogl debug with ifdefs

This commit is contained in:
Eduardo Bart 2012-04-12 16:56:05 -03:00
parent 879827bdbc
commit 0b8d8b4595
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/graphics/graphics.cpp
View File

@ -45,7 +45,7 @@ void Graphics::init()
if(err != GLEW_OK) if(err != GLEW_OK)
logFatal("Unable to init GLEW: ", glewGetErrorString(err)); logFatal("Unable to init GLEW: ", glewGetErrorString(err));
#ifndef NDEBUG #ifdef DEBUG_OPENGL
if(GLEW_ARB_debug_output) if(GLEW_ARB_debug_output)
glDebugMessageCallbackARB(oglDebugCallback, NULL); glDebugMessageCallbackARB(oglDebugCallback, NULL);
#endif #endif

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

@ -368,8 +368,9 @@ void X11Window::internalChooseGLVisual()
#ifndef OPENGL_ES2 #ifndef OPENGL_ES2
static int attrList[] = { static int attrList[] = {
GLX_RENDER_TYPE, GLX_RGBA_BIT, GLX_RENDER_TYPE, GLX_RGBA_BIT,
GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
GLX_DOUBLEBUFFER, True, GLX_DOUBLEBUFFER, True,
//GLX_DEPTH_SIZE, 24,
//GLX_STENCIL_SIZE, 8,
None None
}; };
@ -404,18 +405,18 @@ void X11Window::internalChooseGLVisual()
void X11Window::internalCreateGLContext() void X11Window::internalCreateGLContext()
{ {
#ifndef OPENGL_ES2 #ifndef OPENGL_ES2
#ifdef DEBUG_OPENGL
typedef GLXContext (*GLXCREATECONTEXTATTRIBSARBPROC)(Display*, GLXFBConfig, GLXContext, Bool, const int*); typedef GLXContext (*GLXCREATECONTEXTATTRIBSARBPROC)(Display*, GLXFBConfig, GLXContext, Bool, const int*);
GLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = NULL; GLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = NULL;
glXCreateContextAttribsARB = (GLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress((const GLubyte*) "glXCreateContextAttribsARB"); glXCreateContextAttribsARB = (GLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress((const GLubyte*) "glXCreateContextAttribsARB");
if(glXCreateContextAttribsARB) { if(glXCreateContextAttribsARB) {
int attrs[] = { int attrs[] = {
#ifndef NDEBUG
GLX_CONTEXT_FLAGS_ARB, GLX_CONTEXT_DEBUG_BIT_ARB, GLX_CONTEXT_FLAGS_ARB, GLX_CONTEXT_DEBUG_BIT_ARB,
#endif
None None
}; };
m_glxContext = glXCreateContextAttribsARB(m_display, *m_fbConfig, NULL, True, attrs); m_glxContext = glXCreateContextAttribsARB(m_display, *m_fbConfig, NULL, True, attrs);
} else } else
#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); //m_glxContext = glXCreateContext(m_display, m_visual, NULL, True);