Pārlūkot izejas kodu

GL import fixes for Linux.

bkaradzic 12 gadi atpakaļ
vecāks
revīzija
f554176645
2 mainītis faili ar 10 papildinājumiem un 10 dzēšanām
  1. 2 2
      src/glcontext_glx.cpp
  2. 8 8
      src/glimports.h

+ 2 - 2
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); \
 					} \
 				}

+ 8 - 8
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);