Merge https://github.com/nigels-com/glew.git into master HEAD at Fri Jul 24 17:44:18 GMT 2015

This commit is contained in:
omniavinco 2015-07-25 02:44:18 +09:00
commit bdb7d8bdfc
2 changed files with 5 additions and 3 deletions

View File

@ -195,10 +195,10 @@ GLboolean glewCreateContext (struct createParams* params)
int contextAttrs[20]; int contextAttrs[20];
int i; int i;
extern GLenum GLEWAPIENTRY wglewContextInit();
wglewContextInit(); wglewContextInit();
if (!wglewGetExtension("WGL_ARB_create_context_profile")) /* Intel HD 3000 has WGL_ARB_create_context, but not WGL_ARB_create_context_profile */
if (!wglewGetExtension("WGL_ARB_create_context"))
return GL_TRUE; return GL_TRUE;
i = 0; i = 0;
@ -370,7 +370,7 @@ GLboolean glewCreateContext (struct createParams *params)
glxewContextInit(); glxewContextInit();
if (!glxewGetExtension("GLX_ARB_create_context_profile")) if (!glxewGetExtension("GLX_ARB_create_context"))
return GL_TRUE; return GL_TRUE;
if (glXQueryContext(dpy, oldCtx, GLX_FBCONFIG_ID, &FBConfigAttrs[1])) if (glXQueryContext(dpy, oldCtx, GLX_FBCONFIG_ID, &FBConfigAttrs[1]))

View File

@ -17,6 +17,8 @@ GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext *ctx,
#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x) #define WGLEW_GET_VAR(x) (*(const GLboolean*)&x)
#define WGLEW_GET_FUN(x) x #define WGLEW_GET_FUN(x) x
GLEWAPI GLenum GLEWAPIENTRY wglewContextInit ();
GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const char *name);
GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name); GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name);
#endif /* GLEW_MX */ #endif /* GLEW_MX */