mirror of
https://github.com/nigels-com/glew.git
synced 2024-11-24 14:55:07 +00:00
Extend glewinfo to request specific GL versions/profiles/flags.
This commit is contained in:
Matthias Bentrup
Nigel Stewart
parent
2e757f4b95
commit
9d1aa00702
@ -26,16 +26,22 @@ GLXEWContext _glxewctx;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
struct createParams {
|
||||
#if defined(_WIN32)
|
||||
GLboolean glewCreateContext (int* pixelformat);
|
||||
int pixelformat;
|
||||
#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX)
|
||||
GLboolean glewCreateContext (const char* display, int* visual);
|
||||
#else
|
||||
GLboolean glewCreateContext ();
|
||||
const char* display;
|
||||
int visual;
|
||||
#endif
|
||||
int major, minor;
|
||||
int profile_mask;
|
||||
int flags;
|
||||
};
|
||||
|
||||
GLboolean glewCreateContext (struct createParams *params);
|
||||
|
||||
#if defined(_WIN32) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
|
||||
GLboolean glewParseArgs (int argc, char** argv, char** display, int* visual);
|
||||
GLboolean glewParseArgs (int argc, char** argv, struct createParams *);
|
||||
#endif
|
||||
|
||||
void glewDestroyContext ();
|
||||
|
||||
@ -11,29 +11,38 @@ int main (void)
|
||||
#endif
|
||||
{
|
||||
GLuint err;
|
||||
struct createParams params = {
|
||||
#if defined(_WIN32)
|
||||
-1, /* pixelformat */
|
||||
#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX)
|
||||
"", /* display */
|
||||
-1, /* visual */
|
||||
#endif
|
||||
0, /* major */
|
||||
0, /* minor */
|
||||
0, /* profile mask */
|
||||
0 /* flags */
|
||||
};
|
||||
|
||||
#if defined(_WIN32) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
|
||||
char* display = NULL;
|
||||
int visual = -1;
|
||||
|
||||
if (glewParseArgs(argc-1, argv+1, &display, &visual))
|
||||
if (glewParseArgs(argc-1, argv+1, ¶ms))
|
||||
{
|
||||
fprintf(stderr, "Usage: glewinfo "
|
||||
#if defined(_WIN32)
|
||||
fprintf(stderr, "Usage: glewinfo [-pf <id>]\n");
|
||||
"[-pf <pixelformat>] "
|
||||
#else
|
||||
fprintf(stderr, "Usage: glewinfo [-display <display>] [-visual <id>]\n");
|
||||
"[-display <display>] "
|
||||
"[-visual <visual id>] "
|
||||
#endif
|
||||
"[-version <OpenGL version>] "
|
||||
"[-profiles <OpenGL profile mask>] "
|
||||
"[-flags <OpenGL flags>]"
|
||||
"\n");
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
if (GL_TRUE == glewCreateContext(&visual))
|
||||
#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
|
||||
if (GL_TRUE == glewCreateContext())
|
||||
#else
|
||||
if (GL_TRUE == glewCreateContext(display, &visual))
|
||||
#endif
|
||||
if (GL_TRUE == glewCreateContext(¶ms))
|
||||
{
|
||||
fprintf(stderr, "Error: glewCreateContext failed\n");
|
||||
glewDestroyContext();
|
||||
@ -73,10 +82,10 @@ int main (void)
|
||||
fprintf(f, "---------------------------\n\n");
|
||||
fprintf(f, "GLEW version %s\n", glewGetString(GLEW_VERSION));
|
||||
#if defined(_WIN32)
|
||||
fprintf(f, "Reporting capabilities of pixelformat %d\n", visual);
|
||||
fprintf(f, "Reporting capabilities of pixelformat %d\n", params.pixelformat);
|
||||
#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
|
||||
fprintf(f, "Reporting capabilities of display %s, visual 0x%x\n",
|
||||
display == NULL ? getenv("DISPLAY") : display, visual);
|
||||
params.display == NULL ? getenv("DISPLAY") : params.display, params.visual);
|
||||
#endif
|
||||
fprintf(f, "Running on a %s from %s\n",
|
||||
glGetString(GL_RENDERER), glGetString(GL_VENDOR));
|
||||
@ -95,34 +104,46 @@ int main (void)
|
||||
/* ------------------------------------------------------------------------ */
|
||||
|
||||
#if defined(_WIN32) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
|
||||
GLboolean glewParseArgs (int argc, char** argv, char** display, int* visual)
|
||||
GLboolean glewParseArgs (int argc, char** argv, struct createParams *params)
|
||||
{
|
||||
int p = 0;
|
||||
while (p < argc)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
if (!strcmp(argv[p], "-pf") || !strcmp(argv[p], "-pixelformat"))
|
||||
if (!strcmp(argv[p], "-version"))
|
||||
{
|
||||
if (++p >= argc) return GL_TRUE;
|
||||
*display = 0;
|
||||
*visual = strtol(argv[p++], NULL, 0);
|
||||
if (sscanf(argv[p++], "%d.%d", ¶ms->major, ¶ms->minor) != 2) return GL_TRUE;
|
||||
}
|
||||
else
|
||||
return GL_TRUE;
|
||||
#else
|
||||
if (!strcmp(argv[p], "-display"))
|
||||
else if (!strcmp(argv[p], "-profiles"))
|
||||
{
|
||||
if (++p >= argc) return GL_TRUE;
|
||||
*display = argv[p++];
|
||||
params->profile_mask = (int)strtol(argv[p++], NULL, 0);
|
||||
}
|
||||
else if (!strcmp(argv[p], "-flags"))
|
||||
{
|
||||
if (++p >= argc) return GL_TRUE;
|
||||
params->flags = (int)strtol(argv[p++], NULL, 0);
|
||||
}
|
||||
#if defined(_WIN32)
|
||||
else if (!strcmp(argv[p], "-pf") || !strcmp(argv[p], "-pixelformat"))
|
||||
{
|
||||
if (++p >= argc) return GL_TRUE;
|
||||
params->pixelformat = strtol(argv[p++], NULL, 0);
|
||||
}
|
||||
#else
|
||||
else if (!strcmp(argv[p], "-display"))
|
||||
{
|
||||
if (++p >= argc) return GL_TRUE;
|
||||
params->display = argv[p++];
|
||||
}
|
||||
else if (!strcmp(argv[p], "-visual"))
|
||||
{
|
||||
if (++p >= argc) return GL_TRUE;
|
||||
*visual = (int)strtol(argv[p++], NULL, 0);
|
||||
params->visual = (int)strtol(argv[p++], NULL, 0);
|
||||
}
|
||||
#endif
|
||||
else
|
||||
return GL_TRUE;
|
||||
#endif
|
||||
}
|
||||
return GL_FALSE;
|
||||
}
|
||||
@ -136,7 +157,7 @@ HWND wnd = NULL;
|
||||
HDC dc = NULL;
|
||||
HGLRC rc = NULL;
|
||||
|
||||
GLboolean glewCreateContext (int* pixelformat)
|
||||
GLboolean glewCreateContext (struct createParams* params)
|
||||
{
|
||||
WNDCLASS wc;
|
||||
PIXELFORMATDESCRIPTOR pfd;
|
||||
@ -155,20 +176,58 @@ GLboolean glewCreateContext (int* pixelformat)
|
||||
if (NULL == dc) return GL_TRUE;
|
||||
/* find pixel format */
|
||||
ZeroMemory(&pfd, sizeof(PIXELFORMATDESCRIPTOR));
|
||||
if (*pixelformat == -1) /* find default */
|
||||
if (params->pixelformat == -1) /* find default */
|
||||
{
|
||||
pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
|
||||
pfd.nVersion = 1;
|
||||
pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
|
||||
*pixelformat = ChoosePixelFormat(dc, &pfd);
|
||||
if (*pixelformat == 0) return GL_TRUE;
|
||||
params->pixelformat = ChoosePixelFormat(dc, &pfd);
|
||||
if (params->pixelformat == 0) return GL_TRUE;
|
||||
}
|
||||
/* set the pixel format for the dc */
|
||||
if (FALSE == SetPixelFormat(dc, *pixelformat, &pfd)) return GL_TRUE;
|
||||
if (FALSE == SetPixelFormat(dc, params->pixelformat, &pfd)) return GL_TRUE;
|
||||
/* create rendering context */
|
||||
rc = wglCreateContext(dc);
|
||||
if (NULL == rc) return GL_TRUE;
|
||||
if (FALSE == wglMakeCurrent(dc, rc)) return GL_TRUE;
|
||||
if (params->major || params->profile_mask || params->flags)
|
||||
{
|
||||
HGLRC oldRC = rc;
|
||||
int contextAttrs[20];
|
||||
int i;
|
||||
|
||||
extern GLenum GLEWAPIENTRY wglewContextInit();
|
||||
wglewContextInit();
|
||||
|
||||
if (!wglewGetExtension("WGL_ARB_create_context_profile"))
|
||||
return GL_TRUE;
|
||||
|
||||
i = 0;
|
||||
if( params->major )
|
||||
{
|
||||
contextAttrs[i++] = WGL_CONTEXT_MAJOR_VERSION_ARB;
|
||||
contextAttrs[i++] = params->major;
|
||||
contextAttrs[i++] = WGL_CONTEXT_MINOR_VERSION_ARB;
|
||||
contextAttrs[i++] = params->minor;
|
||||
}
|
||||
if( params->profile_mask )
|
||||
{
|
||||
contextAttrs[i++] = WGL_CONTEXT_PROFILE_MASK_ARB;
|
||||
contextAttrs[i++] = params->profile_mask;
|
||||
}
|
||||
if( params->flags )
|
||||
{
|
||||
contextAttrs[i++] = WGL_CONTEXT_FLAGS_ARB;
|
||||
contextAttrs[i++] = params->flags;
|
||||
}
|
||||
contextAttrs[i++] = 0;
|
||||
rc = wglCreateContextAttribsARB(dc, 0, contextAttrs);
|
||||
|
||||
if (NULL == rc) return GL_TRUE;
|
||||
if (!wglMakeCurrent(dc, rc)) return GL_TRUE;
|
||||
|
||||
wglDeleteContext(oldRC);
|
||||
}
|
||||
return GL_FALSE;
|
||||
}
|
||||
|
||||
@ -190,21 +249,24 @@ void glewDestroyContext ()
|
||||
|
||||
CGLContextObj ctx, octx;
|
||||
|
||||
GLboolean glewCreateContext ()
|
||||
GLboolean glewCreateContext (struct createParams *params)
|
||||
{
|
||||
const CGLPixelFormatAttribute attrib[4] =
|
||||
{
|
||||
kCGLPFAAccelerated, /* No software rendering */
|
||||
#if 0
|
||||
kCGLPFAOpenGLProfile, /* OSX 10.7 Lion onwards */
|
||||
(CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core, /* 3.2 Core Context */
|
||||
#endif
|
||||
0
|
||||
};
|
||||
CGLPixelFormatObj pf;
|
||||
GLint npix;
|
||||
CGLError error;
|
||||
|
||||
if( params->major < 3 &&
|
||||
!(params->profile_mask & GL_CONTEXT_CORE_PROFILE_BIT) ) {
|
||||
attrib[1] = 0; // terminate attrib array before the core profile attribute
|
||||
}
|
||||
|
||||
error = CGLChoosePixelFormat(attrib, &pf, &npix);
|
||||
if (error) return GL_TRUE;
|
||||
error = CGLCreateContext(pf, NULL, &ctx);
|
||||
@ -230,7 +292,7 @@ void glewDestroyContext ()
|
||||
|
||||
#elif defined(__HAIKU__)
|
||||
|
||||
GLboolean glewCreateContext ()
|
||||
GLboolean glewCreateContext (struct createParams *params)
|
||||
{
|
||||
/* TODO: Haiku: We need to call C++ code here */
|
||||
return GL_FALSE;
|
||||
@ -252,22 +314,22 @@ GLXContext ctx = NULL;
|
||||
Window wnd = 0;
|
||||
Colormap cmap = 0;
|
||||
|
||||
GLboolean glewCreateContext (const char* display, int* visual)
|
||||
GLboolean glewCreateContext (struct createParams *params)
|
||||
{
|
||||
int attrib[] = { GLX_RGBA, GLX_DOUBLEBUFFER, None };
|
||||
int erb, evb;
|
||||
XSetWindowAttributes swa;
|
||||
/* open display */
|
||||
dpy = XOpenDisplay(display);
|
||||
dpy = XOpenDisplay(params->display);
|
||||
if (NULL == dpy) return GL_TRUE;
|
||||
/* query for glx */
|
||||
if (!glXQueryExtension(dpy, &erb, &evb)) return GL_TRUE;
|
||||
/* choose visual */
|
||||
if (*visual == -1)
|
||||
if (params->visual == -1)
|
||||
{
|
||||
vi = glXChooseVisual(dpy, DefaultScreen(dpy), attrib);
|
||||
if (NULL == vi) return GL_TRUE;
|
||||
*visual = (int)XVisualIDFromVisual(vi->visual);
|
||||
params->visual = (int)XVisualIDFromVisual(vi->visual);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -275,7 +337,7 @@ GLboolean glewCreateContext (const char* display, int* visual)
|
||||
vis = XGetVisualInfo(dpy, 0, NULL, &n_vis);
|
||||
for (i=0; i<n_vis; i++)
|
||||
{
|
||||
if ((int)XVisualIDFromVisual(vis[i].visual) == *visual)
|
||||
if ((int)XVisualIDFromVisual(vis[i].visual) == params->visual)
|
||||
vi = &vis[i];
|
||||
}
|
||||
if (vi == NULL) return GL_TRUE;
|
||||
@ -293,6 +355,54 @@ GLboolean glewCreateContext (const char* display, int* visual)
|
||||
CWBorderPixel | CWColormap, &swa);
|
||||
/* make context current */
|
||||
if (!glXMakeCurrent(dpy, wnd, ctx)) return GL_TRUE;
|
||||
if (params->major || params->profile_mask || params->flags)
|
||||
{
|
||||
GLXContext oldCtx = ctx;
|
||||
GLXFBConfig *FBConfigs;
|
||||
int FBConfigAttrs[] = { GLX_FBCONFIG_ID, 0, None };
|
||||
int contextAttrs[20];
|
||||
int nelems, i;
|
||||
|
||||
glxewContextInit();
|
||||
|
||||
if (!glxewGetExtension("GLX_ARB_create_context_profile"))
|
||||
return GL_TRUE;
|
||||
|
||||
if (glXQueryContext(dpy, oldCtx, GLX_FBCONFIG_ID, &FBConfigAttrs[1]))
|
||||
return GL_TRUE;
|
||||
FBConfigs = glXChooseFBConfig(dpy, vi->screen, FBConfigAttrs, &nelems);
|
||||
|
||||
if (nelems < 1)
|
||||
return GL_TRUE;
|
||||
|
||||
i = 0;
|
||||
if( params->major )
|
||||
{
|
||||
contextAttrs[i++] = GLX_CONTEXT_MAJOR_VERSION_ARB;
|
||||
contextAttrs[i++] = params->major;
|
||||
contextAttrs[i++] = GLX_CONTEXT_MINOR_VERSION_ARB;
|
||||
contextAttrs[i++] = params->minor;
|
||||
}
|
||||
if( params->profile_mask )
|
||||
{
|
||||
contextAttrs[i++] = GLX_CONTEXT_PROFILE_MASK_ARB;
|
||||
contextAttrs[i++] = params->profile_mask;
|
||||
}
|
||||
if( params->flags )
|
||||
{
|
||||
contextAttrs[i++] = GLX_CONTEXT_FLAGS_ARB;
|
||||
contextAttrs[i++] = params->flags;
|
||||
}
|
||||
contextAttrs[i++] = None;
|
||||
ctx = glXCreateContextAttribsARB(dpy, *FBConfigs, NULL, True, contextAttrs);
|
||||
|
||||
if (NULL == ctx) return GL_TRUE;
|
||||
if (!glXMakeCurrent(dpy, wnd, ctx)) return GL_TRUE;
|
||||
|
||||
glXDestroyContext(dpy, oldCtx);
|
||||
|
||||
XFree(FBConfigs);
|
||||
}
|
||||
return GL_FALSE;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user