mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 09:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made it an error to not define an entry point retrieval mechanism on X11.

Browse Source
This commit is contained in:
Camilla Berglund 2011-09-06 14:40:39 +02:00
parent 81cfc1001d
commit f08397a108
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/opengl.c
View File

@ -411,14 +411,8 @@ GLboolean _glfwIsValidContext(_GLFWwindow* window, _GLFWwndconfig* wndconfig)
window->GetStringi = (PFNGLGETSTRINGIPROC) glfwGetProcAddress("glGetStringi"); window->GetStringi = (PFNGLGETSTRINGIPROC) glfwGetProcAddress("glGetStringi");
if (!window->GetStringi) if (!window->GetStringi)
{ {
// This is a very common problem among people who compile GLFW
// on X11/GLX using custom build systems, as it needs explicit
// configuration in order to work
_glfwSetError(GLFW_PLATFORM_ERROR, _glfwSetError(GLFW_PLATFORM_ERROR,
"glfwOpenWindow: Entry point retrieval is broken " "glfwOpenWindow: Entry point retrieval is broken");
"because GLFW was incorrectly compiled; "
"see the build documentation for your platform");
return GL_FALSE; return GL_FALSE;
} }
} }

4
src/x11_opengl.c
View File

@ -38,7 +38,7 @@ void (*glXGetProcAddressEXT(const GLubyte* procName))();
// We support four different ways for getting addresses for GL/GLX // We support four different ways for getting addresses for GL/GLX
// extension functions: glXGetProcAddress, glXGetProcAddressARB, // extension functions: glXGetProcAddress, glXGetProcAddressARB,
// glXGetProcAddressEXT, and dlsym // glXGetProcAddressEXT, and dlsym
#if defined(_GLFW_HAS_GLXGETPROCADDRESSARB) #if defined(_GLFW_HAS_GLXGETPROCADDRESSARB)
#define _glfw_glXGetProcAddress(x) glXGetProcAddressARB(x) #define _glfw_glXGetProcAddress(x) glXGetProcAddressARB(x)
#elif defined(_GLFW_HAS_GLXGETPROCADDRESS) #elif defined(_GLFW_HAS_GLXGETPROCADDRESS)
#define _glfw_glXGetProcAddress(x) glXGetProcAddress(x) #define _glfw_glXGetProcAddress(x) glXGetProcAddress(x)
@ -48,7 +48,7 @@ void (*glXGetProcAddressEXT(const GLubyte* procName))();
#define _glfw_glXGetProcAddress(x) dlsym(_glfwLibrary.X11.libGL, x) #define _glfw_glXGetProcAddress(x) dlsym(_glfwLibrary.X11.libGL, x)
#define _GLFW_DLOPEN_LIBGL #define _GLFW_DLOPEN_LIBGL
#else #else
#define _glfw_glXGetProcAddress(x) NULL #error "No OpenGL entry point retrieval mechanism was enabled"
#endif #endif