ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup GLX

This commit is contained in:
Jannik Vogel 2015-07-13 13:10:40 +02:00
parent 6acc7e2d13
commit b392aeed7a
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gl/gloffscreen_glx.c
View File

@ -30,6 +30,7 @@
#include <GL/glew.h> #include <GL/glew.h>
#include <GL/glx.h> #include <GL/glx.h>
#include <GL/glxext.h>
#include <GL/glut.h> #include <GL/glut.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -95,15 +96,13 @@ GloContext *glo_context_create(int formatFlags)
#endif #endif
/* Create GLX context */ /* Create GLX context */
PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB =
/* FIXME: Check for "GLX_ARB_create_context" extension*/ (PFNGLXCREATECONTEXTATTRIBSARBPROC)
#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 glXGetProcAddress((const GLubyte*)"glXCreateContextAttribsARB");
#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 if (glXCreateContextAttribsARB == NULL) {
#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 printf("GLX doesn't support ARB_create_context extension.\n");
#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 exit(1);
typedef GLXContext (*GLXCREATECONTEXTATTRIBSARBPROC)(Display*, GLXFBConfig, GLXContext, Bool, const int*); }
GLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = (GLXCREATECONTEXTATTRIBSARBPROC) glXGetProcAddress((const GLubyte*)"glXCreateContextAttribsARB");
if (glXCreateContextAttribsARB == NULL) return NULL;
int context_attribute_list[] = { int context_attribute_list[] = {
GLX_CONTEXT_MAJOR_VERSION_ARB, 3, GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
GLX_CONTEXT_MINOR_VERSION_ARB, 3, GLX_CONTEXT_MINOR_VERSION_ARB, 3,
@ -111,9 +110,6 @@ GloContext *glo_context_create(int formatFlags)
None None
}; };
context->glx_context = glXCreateContextAttribsARB(x_display, configs[0], 0, True, context_attribute_list); context->glx_context = glXCreateContextAttribsARB(x_display, configs[0], 0, True, context_attribute_list);
if (context->glx_context == NULL) {
assert(0);
}
XSync(x_display, False); XSync(x_display, False);
if (context->glx_context == NULL) return NULL; if (context->glx_context == NULL) return NULL;
glo_set_current(context); glo_set_current(context);
@ -123,7 +119,7 @@ GloContext *glo_context_create(int formatFlags)
glewExperimental = GL_TRUE; glewExperimental = GL_TRUE;
if (GLEW_OK != glewInit()) { if (GLEW_OK != glewInit()) {
/* GLEW failed! */ /* GLEW failed! */
printf("GLEW init failed."); printf("GLEW init failed.\n");
exit(1); exit(1);
} }