From f55417664591cabee2cbe335d497ed24775510d2 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Wed, 19 Feb 2014 20:53:06 -0800 Subject: [PATCH] GL import fixes for Linux. --- src/glcontext_glx.cpp | 4 ++-- src/glimports.h | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/glcontext_glx.cpp b/src/glcontext_glx.cpp index bfb1dc64..55294cd4 100644 --- a/src/glcontext_glx.cpp +++ b/src/glcontext_glx.cpp @@ -223,8 +223,8 @@ namespace bgfx { \ if (NULL == _func) \ { \ - _func = (_proto)glXGetProcAddress((const GLubyte*)#_import); \ - BX_TRACE(#_func " = " #_import " 0x%08x", _func); \ + _func = (_proto)glXGetProcAddress( (const GLubyte*)#_import); \ + BX_TRACE("%p " #_func " (" #_import ")", _func); \ BGFX_FATAL(_optional || NULL != _func, Fatal::UnableToInitialize, "Failed to create OpenGL context. glXGetProcAddress %s", #_import); \ } \ } diff --git a/src/glimports.h b/src/glimports.h index 699d5d49..b4ca41df 100644 --- a/src/glimports.h +++ b/src/glimports.h @@ -283,14 +283,14 @@ GL_IMPORT____(false, PFNGLVIEWPORTPROC, glViewport); GL_IMPORT____(false, PFNGLCLEARDEPTHPROC, glClearDepth); GL_IMPORT____(false, PFNGLPOINTSIZEPROC, glPointSize); -GL_IMPORT____(true, PFNGLDEBUGMESSAGECONTROLARBPROC, glDebugMessageControl); -GL_IMPORT____(true, PFNGLDEBUGMESSAGEINSERTARBPROC, glDebugMessageInsert); -GL_IMPORT____(true, PFNGLDEBUGMESSAGECALLBACKARBPROC, glDebugMessageCallback); -GL_IMPORT____(true, PFNGLGETDEBUGMESSAGELOGARBPROC, glGetDebugMessageLog); -GL_IMPORT_ARB(true, PFNGLDEBUGMESSAGECONTROLARBPROC, glDebugMessageControl); -GL_IMPORT_ARB(true, PFNGLDEBUGMESSAGEINSERTARBPROC, glDebugMessageInsert); -GL_IMPORT_ARB(true, PFNGLDEBUGMESSAGECALLBACKARBPROC, glDebugMessageCallback); -GL_IMPORT_ARB(true, PFNGLGETDEBUGMESSAGELOGARBPROC, glGetDebugMessageLog); +//GL_IMPORT____(true, PFNGLDEBUGMESSAGECONTROLARBPROC, glDebugMessageControl); +//GL_IMPORT____(true, PFNGLDEBUGMESSAGEINSERTARBPROC, glDebugMessageInsert); +//GL_IMPORT____(true, PFNGLDEBUGMESSAGECALLBACKARBPROC, glDebugMessageCallback); +//GL_IMPORT____(true, PFNGLGETDEBUGMESSAGELOGARBPROC, glGetDebugMessageLog); +GL_IMPORT (true, PFNGLDEBUGMESSAGECONTROLARBPROC, glDebugMessageControl, glDebugMessageControlARB); +GL_IMPORT (true, PFNGLDEBUGMESSAGEINSERTARBPROC, glDebugMessageInsert, glDebugMessageInsertARB); +GL_IMPORT (true, PFNGLDEBUGMESSAGECALLBACKARBPROC, glDebugMessageCallback, glDebugMessageCallbackARB); +GL_IMPORT (true, PFNGLGETDEBUGMESSAGELOGARBPROC, glGetDebugMessageLog, glGetDebugMessageLogARB); GL_IMPORT_ARB(true, PFNGLVERTEXATTRIBDIVISORPROC, glVertexAttribDivisor); GL_IMPORT_ARB(true, PFNGLDRAWARRAYSINSTANCEDPROC, glDrawArraysInstanced);