2006-07-28 08:43:17 +00:00
|
|
|
/*
|
2011-04-08 13:03:26 -07:00
|
|
|
Simple DirectMedia Layer
|
2011-12-31 09:28:07 -05:00
|
|
|
Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
|
2011-04-08 13:03:26 -07:00
|
|
|
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
|
|
warranty. In no event will the authors be held liable for any damages
|
|
|
|
arising from the use of this software.
|
|
|
|
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
|
|
including commercial applications, and to alter it and redistribute it
|
|
|
|
freely, subject to the following restrictions:
|
|
|
|
|
|
|
|
1. The origin of this software must not be misrepresented; you must not
|
|
|
|
claim that you wrote the original software. If you use this software
|
|
|
|
in a product, an acknowledgment in the product documentation would be
|
|
|
|
appreciated but is not required.
|
|
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
|
|
|
misrepresented as being the original software.
|
|
|
|
3. This notice may not be removed or altered from any source distribution.
|
2006-07-28 08:43:17 +00:00
|
|
|
*/
|
|
|
|
#include "SDL_config.h"
|
2011-10-31 05:56:58 -04:00
|
|
|
|
|
|
|
#if SDL_VIDEO_DRIVER_X11
|
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
#include "SDL_x11video.h"
|
2011-10-13 01:08:30 -04:00
|
|
|
#include "SDL_assert.h"
|
2006-07-28 08:43:17 +00:00
|
|
|
|
|
|
|
/* GLX implementation of SDL OpenGL support */
|
|
|
|
|
|
|
|
#if SDL_VIDEO_OPENGL_GLX
|
|
|
|
#include "SDL_loadso.h"
|
|
|
|
|
|
|
|
#if defined(__IRIX__)
|
|
|
|
/* IRIX doesn't have a GL library versioning system */
|
|
|
|
#define DEFAULT_OPENGL "libGL.so"
|
|
|
|
#elif defined(__MACOSX__)
|
|
|
|
#define DEFAULT_OPENGL "/usr/X11R6/lib/libGL.1.dylib"
|
|
|
|
#elif defined(__QNXNTO__)
|
|
|
|
#define DEFAULT_OPENGL "libGL.so.3"
|
|
|
|
#else
|
|
|
|
#define DEFAULT_OPENGL "libGL.so.1"
|
|
|
|
#endif
|
|
|
|
|
2009-09-05 07:33:54 +00:00
|
|
|
#ifndef GLX_NONE_EXT
|
|
|
|
#define GLX_NONE_EXT 0x8000
|
|
|
|
#endif
|
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
#ifndef GLX_ARB_multisample
|
|
|
|
#define GLX_ARB_multisample
|
|
|
|
#define GLX_SAMPLE_BUFFERS_ARB 100000
|
|
|
|
#define GLX_SAMPLES_ARB 100001
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef GLX_EXT_visual_rating
|
|
|
|
#define GLX_EXT_visual_rating
|
|
|
|
#define GLX_VISUAL_CAVEAT_EXT 0x20
|
|
|
|
#define GLX_NONE_EXT 0x8000
|
|
|
|
#define GLX_SLOW_VISUAL_EXT 0x8001
|
|
|
|
#define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D
|
|
|
|
#endif
|
|
|
|
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
#ifndef GLX_ARB_create_context
|
|
|
|
#define GLX_ARB_create_context
|
|
|
|
#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
|
|
|
|
#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
|
|
|
|
#define GLX_CONTEXT_FLAGS_ARB 0x2094
|
|
|
|
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
|
|
|
|
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
|
2011-01-18 14:57:39 -08:00
|
|
|
|
|
|
|
/* Typedef for the GL 3.0 context creation function */
|
|
|
|
typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display * dpy,
|
|
|
|
GLXFBConfig config,
|
|
|
|
GLXContext
|
|
|
|
share_context,
|
|
|
|
Bool direct,
|
|
|
|
const int
|
|
|
|
*attrib_list);
|
2012-07-11 22:20:02 -04:00
|
|
|
#endif
|
2012-02-20 23:37:57 -05:00
|
|
|
|
|
|
|
#ifndef GLX_ARB_create_context_profile
|
|
|
|
#define GLX_ARB_create_context_profile
|
|
|
|
#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
|
|
|
|
#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
|
|
|
|
#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef GLX_ARB_create_context_robustness
|
|
|
|
#define GLX_ARB_create_context_robustness
|
|
|
|
#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
|
|
|
|
#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
|
|
|
|
#define GLX_NO_RESET_NOTIFICATION_ARB 0x8261
|
|
|
|
#define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef GLX_EXT_create_context_es2_profile
|
|
|
|
#define GLX_EXT_create_context_es2_profile
|
|
|
|
#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000002
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef GLX_EXT_swap_control
|
|
|
|
#define GLX_SWAP_INTERVAL_EXT 0x20F1
|
|
|
|
#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
#endif
|
|
|
|
|
2012-01-07 21:02:39 -08:00
|
|
|
#define OPENGL_REQUIRES_DLOPEN
|
|
|
|
#if defined(OPENGL_REQUIRES_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
|
2006-07-28 08:43:17 +00:00
|
|
|
#include <dlfcn.h>
|
|
|
|
#define GL_LoadObject(X) dlopen(X, (RTLD_NOW|RTLD_GLOBAL))
|
|
|
|
#define GL_LoadFunction dlsym
|
|
|
|
#define GL_UnloadObject dlclose
|
|
|
|
#else
|
|
|
|
#define GL_LoadObject SDL_LoadObject
|
|
|
|
#define GL_LoadFunction SDL_LoadFunction
|
|
|
|
#define GL_UnloadObject SDL_UnloadObject
|
|
|
|
#endif
|
|
|
|
|
2009-02-09 05:32:12 +00:00
|
|
|
static void X11_GL_InitExtensions(_THIS);
|
2008-03-06 17:08:10 +00:00
|
|
|
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
int
|
|
|
|
X11_GL_LoadLibrary(_THIS, const char *path)
|
|
|
|
{
|
|
|
|
void *handle;
|
|
|
|
|
2009-02-09 05:32:12 +00:00
|
|
|
/* Load the OpenGL library */
|
|
|
|
if (path == NULL) {
|
|
|
|
path = SDL_getenv("SDL_OPENGL_LIBRARY");
|
|
|
|
}
|
|
|
|
if (path == NULL) {
|
|
|
|
path = DEFAULT_OPENGL;
|
|
|
|
}
|
2012-01-07 21:02:39 -08:00
|
|
|
_this->gl_config.dll_handle = GL_LoadObject(path);
|
2009-02-09 05:32:12 +00:00
|
|
|
if (!_this->gl_config.dll_handle) {
|
2012-01-07 21:02:39 -08:00
|
|
|
#if defined(OPENGL_REQUIRES_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
|
|
|
|
SDL_SetError("Failed loading %s: %s", path, dlerror());
|
|
|
|
#endif
|
2009-02-09 05:32:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
SDL_strlcpy(_this->gl_config.driver_path, path,
|
|
|
|
SDL_arraysize(_this->gl_config.driver_path));
|
|
|
|
|
|
|
|
/* Allocate OpenGL memory */
|
|
|
|
_this->gl_data =
|
|
|
|
(struct SDL_GLDriverData *) SDL_calloc(1,
|
|
|
|
sizeof(struct
|
|
|
|
SDL_GLDriverData));
|
|
|
|
if (!_this->gl_data) {
|
|
|
|
SDL_OutOfMemory();
|
|
|
|
return -1;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
2007-08-15 03:50:49 +00:00
|
|
|
|
2009-02-09 05:32:12 +00:00
|
|
|
/* Load function pointers */
|
|
|
|
handle = _this->gl_config.dll_handle;
|
2006-07-28 08:43:17 +00:00
|
|
|
_this->gl_data->glXGetProcAddress =
|
2010-07-18 11:18:36 -07:00
|
|
|
(void *(*)(const GLubyte *))
|
|
|
|
GL_LoadFunction(handle, "glXGetProcAddressARB");
|
2006-07-28 08:43:17 +00:00
|
|
|
_this->gl_data->glXChooseVisual =
|
2010-07-18 11:18:36 -07:00
|
|
|
(XVisualInfo * (*)(Display *, int, int *))
|
|
|
|
X11_GL_GetProcAddress(_this, "glXChooseVisual");
|
2006-07-28 08:43:17 +00:00
|
|
|
_this->gl_data->glXCreateContext =
|
|
|
|
(GLXContext(*)(Display *, XVisualInfo *, GLXContext, int))
|
2010-07-18 11:18:36 -07:00
|
|
|
X11_GL_GetProcAddress(_this, "glXCreateContext");
|
2006-07-28 08:43:17 +00:00
|
|
|
_this->gl_data->glXDestroyContext =
|
2010-07-18 11:18:36 -07:00
|
|
|
(void (*)(Display *, GLXContext))
|
|
|
|
X11_GL_GetProcAddress(_this, "glXDestroyContext");
|
2006-07-28 08:43:17 +00:00
|
|
|
_this->gl_data->glXMakeCurrent =
|
2010-07-18 11:18:36 -07:00
|
|
|
(int (*)(Display *, GLXDrawable, GLXContext))
|
|
|
|
X11_GL_GetProcAddress(_this, "glXMakeCurrent");
|
2006-07-28 08:43:17 +00:00
|
|
|
_this->gl_data->glXSwapBuffers =
|
2010-07-18 11:18:36 -07:00
|
|
|
(void (*)(Display *, GLXDrawable))
|
|
|
|
X11_GL_GetProcAddress(_this, "glXSwapBuffers");
|
2011-07-18 14:34:19 -07:00
|
|
|
_this->gl_data->glXQueryDrawable =
|
|
|
|
(void (*)(Display*,GLXDrawable,int,unsigned int*))
|
|
|
|
X11_GL_GetProcAddress(_this, "glXQueryDrawable");
|
2006-07-28 08:43:17 +00:00
|
|
|
|
|
|
|
if (!_this->gl_data->glXChooseVisual ||
|
|
|
|
!_this->gl_data->glXCreateContext ||
|
|
|
|
!_this->gl_data->glXDestroyContext ||
|
2010-07-18 11:18:36 -07:00
|
|
|
!_this->gl_data->glXMakeCurrent ||
|
|
|
|
!_this->gl_data->glXSwapBuffers) {
|
2006-07-28 08:43:17 +00:00
|
|
|
SDL_SetError("Could not retrieve OpenGL functions");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-02-09 05:32:12 +00:00
|
|
|
/* Initialize extensions */
|
|
|
|
X11_GL_InitExtensions(_this);
|
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
X11_GL_GetProcAddress(_THIS, const char *proc)
|
|
|
|
{
|
|
|
|
if (_this->gl_data->glXGetProcAddress) {
|
|
|
|
return _this->gl_data->glXGetProcAddress((const GLubyte *) proc);
|
|
|
|
}
|
2010-07-18 11:18:36 -07:00
|
|
|
return GL_LoadFunction(_this->gl_config.dll_handle, proc);
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
2009-02-09 05:32:12 +00:00
|
|
|
void
|
2006-07-28 08:43:17 +00:00
|
|
|
X11_GL_UnloadLibrary(_THIS)
|
|
|
|
{
|
2009-02-09 05:32:12 +00:00
|
|
|
/* Don't actually unload the library, since it may have registered
|
|
|
|
* X11 shutdown hooks, per the notes at:
|
|
|
|
* http://dri.sourceforge.net/doc/DRIuserguide.html
|
|
|
|
*/
|
|
|
|
#if 0
|
|
|
|
GL_UnloadObject(_this->gl_config.dll_handle);
|
|
|
|
_this->gl_config.dll_handle = NULL;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Free OpenGL memory */
|
2012-01-07 23:33:15 -05:00
|
|
|
if (_this->gl_data) {
|
|
|
|
SDL_free(_this->gl_data);
|
|
|
|
_this->gl_data = NULL;
|
|
|
|
}
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static SDL_bool
|
|
|
|
HasExtension(const char *extension, const char *extensions)
|
|
|
|
{
|
|
|
|
const char *start;
|
|
|
|
const char *where, *terminator;
|
|
|
|
|
|
|
|
/* Extension names should not have spaces. */
|
|
|
|
where = SDL_strchr(extension, ' ');
|
|
|
|
if (where || *extension == '\0')
|
|
|
|
return SDL_FALSE;
|
|
|
|
|
|
|
|
if (!extensions)
|
|
|
|
return SDL_FALSE;
|
|
|
|
|
|
|
|
/* It takes a bit of care to be fool-proof about parsing the
|
|
|
|
* OpenGL extensions string. Don't be fooled by sub-strings,
|
|
|
|
* etc. */
|
|
|
|
|
|
|
|
start = extensions;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
where = SDL_strstr(start, extension);
|
|
|
|
if (!where)
|
|
|
|
break;
|
|
|
|
|
|
|
|
terminator = where + SDL_strlen(extension);
|
|
|
|
if (where == start || *(where - 1) == ' ')
|
|
|
|
if (*terminator == ' ' || *terminator == '\0')
|
|
|
|
return SDL_TRUE;
|
|
|
|
|
|
|
|
start = terminator;
|
|
|
|
}
|
|
|
|
return SDL_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
X11_GL_InitExtensions(_THIS)
|
|
|
|
{
|
|
|
|
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
|
2011-02-10 12:14:37 -08:00
|
|
|
int screen = DefaultScreen(display);
|
2006-07-28 08:43:17 +00:00
|
|
|
XVisualInfo *vinfo;
|
|
|
|
XSetWindowAttributes xattr;
|
|
|
|
Window w;
|
|
|
|
GLXContext context;
|
|
|
|
const char *(*glXQueryExtensionsStringFunc) (Display *, int);
|
|
|
|
const char *extensions;
|
|
|
|
|
|
|
|
vinfo = X11_GL_GetVisual(_this, display, screen);
|
|
|
|
if (!vinfo) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
xattr.background_pixel = 0;
|
|
|
|
xattr.border_pixel = 0;
|
|
|
|
xattr.colormap =
|
|
|
|
XCreateColormap(display, RootWindow(display, screen), vinfo->visual,
|
|
|
|
AllocNone);
|
|
|
|
w = XCreateWindow(display, RootWindow(display, screen), 0, 0, 32, 32, 0,
|
|
|
|
vinfo->depth, InputOutput, vinfo->visual,
|
|
|
|
(CWBackPixel | CWBorderPixel | CWColormap), &xattr);
|
|
|
|
context = _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
|
|
|
|
if (context) {
|
|
|
|
_this->gl_data->glXMakeCurrent(display, w, context);
|
|
|
|
}
|
|
|
|
XFree(vinfo);
|
|
|
|
|
|
|
|
glXQueryExtensionsStringFunc =
|
|
|
|
(const char *(*)(Display *, int)) X11_GL_GetProcAddress(_this,
|
|
|
|
"glXQueryExtensionsString");
|
|
|
|
if (glXQueryExtensionsStringFunc) {
|
|
|
|
extensions = glXQueryExtensionsStringFunc(display, screen);
|
|
|
|
} else {
|
|
|
|
extensions = NULL;
|
|
|
|
}
|
|
|
|
|
2011-07-18 14:34:19 -07:00
|
|
|
/* Check for GLX_EXT_swap_control */
|
|
|
|
if (HasExtension("GLX_EXT_swap_control", extensions)) {
|
|
|
|
_this->gl_data->glXSwapIntervalEXT =
|
2011-08-22 02:26:11 -04:00
|
|
|
(int (*)(Display*,GLXDrawable,int))
|
2011-07-18 14:34:19 -07:00
|
|
|
X11_GL_GetProcAddress(_this, "glXSwapIntervalEXT");
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for GLX_MESA_swap_control */
|
|
|
|
if (HasExtension("GLX_MESA_swap_control", extensions)) {
|
|
|
|
_this->gl_data->glXSwapIntervalMESA =
|
2011-07-18 14:34:19 -07:00
|
|
|
(int(*)(int)) X11_GL_GetProcAddress(_this, "glXSwapIntervalMESA");
|
2006-07-28 08:43:17 +00:00
|
|
|
_this->gl_data->glXGetSwapIntervalMESA =
|
2011-07-18 14:34:19 -07:00
|
|
|
(int(*)(void)) X11_GL_GetProcAddress(_this,
|
2006-07-28 08:43:17 +00:00
|
|
|
"glXGetSwapIntervalMESA");
|
|
|
|
}
|
|
|
|
|
2011-07-18 14:34:19 -07:00
|
|
|
/* Check for GLX_SGI_swap_control */
|
|
|
|
if (HasExtension("GLX_SGI_swap_control", extensions)) {
|
|
|
|
_this->gl_data->glXSwapIntervalSGI =
|
|
|
|
(int (*)(int)) X11_GL_GetProcAddress(_this, "glXSwapIntervalSGI");
|
|
|
|
}
|
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
/* Check for GLX_EXT_visual_rating */
|
|
|
|
if (HasExtension("GLX_EXT_visual_rating", extensions)) {
|
|
|
|
_this->gl_data->HAS_GLX_EXT_visual_rating = SDL_TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (context) {
|
|
|
|
_this->gl_data->glXMakeCurrent(display, None, NULL);
|
|
|
|
_this->gl_data->glXDestroyContext(display, context);
|
|
|
|
}
|
|
|
|
XDestroyWindow(display, w);
|
2008-03-06 23:07:02 +00:00
|
|
|
X11_PumpEvents(_this);
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
2012-02-20 23:37:57 -05:00
|
|
|
/* glXChooseVisual and glXChooseFBConfig have some small differences in
|
|
|
|
* the attribute encoding, it can be chosen with the for_FBConfig parameter.
|
|
|
|
*/
|
Fixed bug 1145 (GL Context creation fails for OpenGL 3.2 + Alpha buffer with X11 BadMatch)
Matthias 2011-02-23 09:37:51 PST
Please view the attached source file. Using this minimal program (as attached),
it creates an OpenGL 2.0 context with a cleared color buffer. If I set the
OpenGL version to 3.2, the function SDL_GL_CreateContext fails (or more
specifically, glXMakeCurrent fails) with an X11 BadMatch error:
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 128 (GLX)
Minor opcode of failed request: 5 (X_GLXMakeCurrent)
Serial number of failed request: 153
Current serial number in output stream: 153
Also note that if I do not specify the alpha buffer size, the program works for
OpenGL 2.0 and OpenGL 3.2.
After some further analysis, I believe I have found the problem. The specific
issue is in:
SDL_x11opengl.c::X11_GL_CreateContext.
Note that for OpenGL 3.2 contexts, the GLXFBConfig to use is chosen as the best
match from glXChooseFBConfig. However, opengl attributes originally set with
SDL_GL_SetAttribute are not mapped to GLX attributes and then passed to the
glXChooseFBConfig function. According to the GLX 1.4 specification, if the
attributes are not specified, the function falls back to defaults (which, in
this particular case, prefer alpha channel size == 0).
For testing purposes, I modified the call to glXChooseFBConfig to look
something like this:
int glxAttribs[] =
{
GLX_RED_SIZE,8,
GLX_GREEN_SIZE,8,
GLX_BLUE_SIZE,8,
GLX_ALPHA_SIZE,8,
None
};
if (!glXChooseFBConfig ||
!(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display),
glxAttribs, &fbcount)))
{
...
}
The best match GLXFBConfig then supports 8 bit alpha channel. The program then
works as intended.
Hope this helps!
2011-02-24 17:52:47 -08:00
|
|
|
int
|
2012-02-20 23:37:57 -05:00
|
|
|
X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int size, Bool for_FBConfig)
|
2006-07-28 08:43:17 +00:00
|
|
|
{
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
int i = 0;
|
2009-05-23 22:41:08 +00:00
|
|
|
|
Fixed bug 1145 (GL Context creation fails for OpenGL 3.2 + Alpha buffer with X11 BadMatch)
Matthias 2011-02-23 09:37:51 PST
Please view the attached source file. Using this minimal program (as attached),
it creates an OpenGL 2.0 context with a cleared color buffer. If I set the
OpenGL version to 3.2, the function SDL_GL_CreateContext fails (or more
specifically, glXMakeCurrent fails) with an X11 BadMatch error:
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 128 (GLX)
Minor opcode of failed request: 5 (X_GLXMakeCurrent)
Serial number of failed request: 153
Current serial number in output stream: 153
Also note that if I do not specify the alpha buffer size, the program works for
OpenGL 2.0 and OpenGL 3.2.
After some further analysis, I believe I have found the problem. The specific
issue is in:
SDL_x11opengl.c::X11_GL_CreateContext.
Note that for OpenGL 3.2 contexts, the GLXFBConfig to use is chosen as the best
match from glXChooseFBConfig. However, opengl attributes originally set with
SDL_GL_SetAttribute are not mapped to GLX attributes and then passed to the
glXChooseFBConfig function. According to the GLX 1.4 specification, if the
attributes are not specified, the function falls back to defaults (which, in
this particular case, prefer alpha channel size == 0).
For testing purposes, I modified the call to glXChooseFBConfig to look
something like this:
int glxAttribs[] =
{
GLX_RED_SIZE,8,
GLX_GREEN_SIZE,8,
GLX_BLUE_SIZE,8,
GLX_ALPHA_SIZE,8,
None
};
if (!glXChooseFBConfig ||
!(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display),
glxAttribs, &fbcount)))
{
...
}
The best match GLXFBConfig then supports 8 bit alpha channel. The program then
works as intended.
Hope this helps!
2011-02-24 17:52:47 -08:00
|
|
|
/* assert buffer is large enough to hold all SDL attributes. */
|
2012-02-07 02:11:15 -05:00
|
|
|
SDL_assert(size >= 32);
|
Fixed bug 1145 (GL Context creation fails for OpenGL 3.2 + Alpha buffer with X11 BadMatch)
Matthias 2011-02-23 09:37:51 PST
Please view the attached source file. Using this minimal program (as attached),
it creates an OpenGL 2.0 context with a cleared color buffer. If I set the
OpenGL version to 3.2, the function SDL_GL_CreateContext fails (or more
specifically, glXMakeCurrent fails) with an X11 BadMatch error:
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 128 (GLX)
Minor opcode of failed request: 5 (X_GLXMakeCurrent)
Serial number of failed request: 153
Current serial number in output stream: 153
Also note that if I do not specify the alpha buffer size, the program works for
OpenGL 2.0 and OpenGL 3.2.
After some further analysis, I believe I have found the problem. The specific
issue is in:
SDL_x11opengl.c::X11_GL_CreateContext.
Note that for OpenGL 3.2 contexts, the GLXFBConfig to use is chosen as the best
match from glXChooseFBConfig. However, opengl attributes originally set with
SDL_GL_SetAttribute are not mapped to GLX attributes and then passed to the
glXChooseFBConfig function. According to the GLX 1.4 specification, if the
attributes are not specified, the function falls back to defaults (which, in
this particular case, prefer alpha channel size == 0).
For testing purposes, I modified the call to glXChooseFBConfig to look
something like this:
int glxAttribs[] =
{
GLX_RED_SIZE,8,
GLX_GREEN_SIZE,8,
GLX_BLUE_SIZE,8,
GLX_ALPHA_SIZE,8,
None
};
if (!glXChooseFBConfig ||
!(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display),
glxAttribs, &fbcount)))
{
...
}
The best match GLXFBConfig then supports 8 bit alpha channel. The program then
works as intended.
Hope this helps!
2011-02-24 17:52:47 -08:00
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
/* Setup our GLX attributes according to the gl_config. */
|
2012-02-20 23:37:57 -05:00
|
|
|
if( for_FBConfig ) {
|
|
|
|
attribs[i++] = GLX_RENDER_TYPE;
|
|
|
|
attribs[i++] = GLX_RGBA_BIT;
|
|
|
|
} else {
|
|
|
|
attribs[i++] = GLX_RGBA;
|
|
|
|
}
|
2006-07-28 08:43:17 +00:00
|
|
|
attribs[i++] = GLX_RED_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.red_size;
|
|
|
|
attribs[i++] = GLX_GREEN_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.green_size;
|
|
|
|
attribs[i++] = GLX_BLUE_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.blue_size;
|
|
|
|
|
|
|
|
if (_this->gl_config.alpha_size) {
|
|
|
|
attribs[i++] = GLX_ALPHA_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.alpha_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_this->gl_config.double_buffer) {
|
|
|
|
attribs[i++] = GLX_DOUBLEBUFFER;
|
2012-02-20 23:37:57 -05:00
|
|
|
if( for_FBConfig )
|
|
|
|
attribs[i++] = True;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
attribs[i++] = GLX_DEPTH_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.depth_size;
|
|
|
|
|
|
|
|
if (_this->gl_config.stencil_size) {
|
|
|
|
attribs[i++] = GLX_STENCIL_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.stencil_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_this->gl_config.accum_red_size) {
|
|
|
|
attribs[i++] = GLX_ACCUM_RED_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.accum_red_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_this->gl_config.accum_green_size) {
|
|
|
|
attribs[i++] = GLX_ACCUM_GREEN_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.accum_green_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_this->gl_config.accum_blue_size) {
|
|
|
|
attribs[i++] = GLX_ACCUM_BLUE_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.accum_blue_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_this->gl_config.accum_alpha_size) {
|
|
|
|
attribs[i++] = GLX_ACCUM_ALPHA_SIZE;
|
|
|
|
attribs[i++] = _this->gl_config.accum_alpha_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_this->gl_config.stereo) {
|
|
|
|
attribs[i++] = GLX_STEREO;
|
2012-02-20 23:37:57 -05:00
|
|
|
if( for_FBConfig )
|
|
|
|
attribs[i++] = True;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (_this->gl_config.multisamplebuffers) {
|
|
|
|
attribs[i++] = GLX_SAMPLE_BUFFERS_ARB;
|
|
|
|
attribs[i++] = _this->gl_config.multisamplebuffers;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_this->gl_config.multisamplesamples) {
|
|
|
|
attribs[i++] = GLX_SAMPLES_ARB;
|
|
|
|
attribs[i++] = _this->gl_config.multisamplesamples;
|
|
|
|
}
|
|
|
|
|
2009-12-15 20:53:09 +00:00
|
|
|
if (_this->gl_config.accelerated >= 0 &&
|
|
|
|
_this->gl_data->HAS_GLX_EXT_visual_rating) {
|
2006-07-28 08:43:17 +00:00
|
|
|
attribs[i++] = GLX_VISUAL_CAVEAT_EXT;
|
2009-12-15 20:36:31 +00:00
|
|
|
attribs[i++] = _this->gl_config.accelerated ? GLX_NONE_EXT :
|
|
|
|
GLX_SLOW_VISUAL_EXT;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
2009-12-15 20:36:31 +00:00
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
attribs[i++] = None;
|
Fixed bug 1145 (GL Context creation fails for OpenGL 3.2 + Alpha buffer with X11 BadMatch)
Matthias 2011-02-23 09:37:51 PST
Please view the attached source file. Using this minimal program (as attached),
it creates an OpenGL 2.0 context with a cleared color buffer. If I set the
OpenGL version to 3.2, the function SDL_GL_CreateContext fails (or more
specifically, glXMakeCurrent fails) with an X11 BadMatch error:
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 128 (GLX)
Minor opcode of failed request: 5 (X_GLXMakeCurrent)
Serial number of failed request: 153
Current serial number in output stream: 153
Also note that if I do not specify the alpha buffer size, the program works for
OpenGL 2.0 and OpenGL 3.2.
After some further analysis, I believe I have found the problem. The specific
issue is in:
SDL_x11opengl.c::X11_GL_CreateContext.
Note that for OpenGL 3.2 contexts, the GLXFBConfig to use is chosen as the best
match from glXChooseFBConfig. However, opengl attributes originally set with
SDL_GL_SetAttribute are not mapped to GLX attributes and then passed to the
glXChooseFBConfig function. According to the GLX 1.4 specification, if the
attributes are not specified, the function falls back to defaults (which, in
this particular case, prefer alpha channel size == 0).
For testing purposes, I modified the call to glXChooseFBConfig to look
something like this:
int glxAttribs[] =
{
GLX_RED_SIZE,8,
GLX_GREEN_SIZE,8,
GLX_BLUE_SIZE,8,
GLX_ALPHA_SIZE,8,
None
};
if (!glXChooseFBConfig ||
!(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display),
glxAttribs, &fbcount)))
{
...
}
The best match GLXFBConfig then supports 8 bit alpha channel. The program then
works as intended.
Hope this helps!
2011-02-24 17:52:47 -08:00
|
|
|
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
XVisualInfo *
|
|
|
|
X11_GL_GetVisual(_THIS, Display * display, int screen)
|
|
|
|
{
|
|
|
|
XVisualInfo *vinfo;
|
|
|
|
|
|
|
|
/* 64 seems nice. */
|
2012-02-20 23:37:57 -05:00
|
|
|
int attribs[64];
|
2012-07-11 22:04:19 -04:00
|
|
|
X11_GL_GetAttributes(_this,display,screen,attribs,64,SDL_FALSE);
|
2006-07-28 08:43:17 +00:00
|
|
|
|
2012-01-07 23:33:15 -05:00
|
|
|
if (!_this->gl_data) {
|
|
|
|
/* The OpenGL library wasn't loaded, SDL_GetError() should have info */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
vinfo = _this->gl_data->glXChooseVisual(display, screen, attribs);
|
|
|
|
if (!vinfo) {
|
|
|
|
SDL_SetError("Couldn't find matching GLX visual");
|
|
|
|
}
|
|
|
|
return vinfo;
|
|
|
|
}
|
|
|
|
|
|
|
|
SDL_GLContext
|
|
|
|
X11_GL_CreateContext(_THIS, SDL_Window * window)
|
|
|
|
{
|
|
|
|
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
|
|
|
|
Display *display = data->videodata->display;
|
|
|
|
int screen =
|
2011-02-10 14:44:25 -08:00
|
|
|
((SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata)->screen;
|
2006-07-28 08:43:17 +00:00
|
|
|
XWindowAttributes xattr;
|
|
|
|
XVisualInfo v, *vinfo;
|
|
|
|
int n;
|
|
|
|
GLXContext context = NULL;
|
|
|
|
|
2006-07-29 03:57:55 +00:00
|
|
|
/* We do this to create a clean separation between X and GLX errors. */
|
2006-07-28 08:43:17 +00:00
|
|
|
XSync(display, False);
|
2010-01-21 06:21:52 +00:00
|
|
|
XGetWindowAttributes(display, data->xwindow, &xattr);
|
2006-07-28 08:43:17 +00:00
|
|
|
v.screen = screen;
|
|
|
|
v.visualid = XVisualIDFromVisual(xattr.visual);
|
|
|
|
vinfo = XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n);
|
|
|
|
if (vinfo) {
|
2009-05-23 22:41:08 +00:00
|
|
|
if (_this->gl_config.major_version < 3) {
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
context =
|
|
|
|
_this->gl_data->glXCreateContext(display, vinfo, NULL, True);
|
|
|
|
} else {
|
|
|
|
/* If we want a GL 3.0 context or later we need to get a temporary
|
|
|
|
context to grab the new context creation function */
|
2009-05-23 22:41:08 +00:00
|
|
|
GLXContext temp_context =
|
|
|
|
_this->gl_data->glXCreateContext(display, vinfo, NULL, True);
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
if (!temp_context) {
|
2009-05-23 22:41:08 +00:00
|
|
|
SDL_SetError("Could not create GL context");
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
return NULL;
|
|
|
|
} else {
|
2012-02-20 23:37:57 -05:00
|
|
|
/* max 8 attributes plus terminator */
|
|
|
|
int attribs[9] = {
|
2009-05-23 22:41:08 +00:00
|
|
|
GLX_CONTEXT_MAJOR_VERSION_ARB,
|
|
|
|
_this->gl_config.major_version,
|
|
|
|
GLX_CONTEXT_MINOR_VERSION_ARB,
|
|
|
|
_this->gl_config.minor_version,
|
|
|
|
0
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
};
|
2012-02-20 23:37:57 -05:00
|
|
|
int iattr = 4;
|
|
|
|
|
|
|
|
/* SDL profile bits match GLX profile bits */
|
|
|
|
if( _this->gl_config.profile_mask != 0 ) {
|
|
|
|
attribs[iattr++] = GLX_CONTEXT_PROFILE_MASK_ARB;
|
|
|
|
attribs[iattr++] = _this->gl_config.profile_mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* SDL flags match GLX flags */
|
|
|
|
if( _this->gl_config.flags != 0 ) {
|
|
|
|
attribs[iattr++] = GLX_CONTEXT_FLAGS_ARB;
|
|
|
|
attribs[iattr++] = _this->gl_config.flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
attribs[iattr++] = 0;
|
2009-05-23 22:41:08 +00:00
|
|
|
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
/* Get a pointer to the context creation function for GL 3.0 */
|
2009-05-23 22:41:08 +00:00
|
|
|
PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs =
|
|
|
|
(PFNGLXCREATECONTEXTATTRIBSARBPROC) _this->gl_data->
|
|
|
|
glXGetProcAddress((GLubyte *)
|
|
|
|
"glXCreateContextAttribsARB");
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
if (!glXCreateContextAttribs) {
|
|
|
|
SDL_SetError("GL 3.x is not supported");
|
|
|
|
context = temp_context;
|
|
|
|
} else {
|
Fixed bug 1145 (GL Context creation fails for OpenGL 3.2 + Alpha buffer with X11 BadMatch)
Matthias 2011-02-23 09:37:51 PST
Please view the attached source file. Using this minimal program (as attached),
it creates an OpenGL 2.0 context with a cleared color buffer. If I set the
OpenGL version to 3.2, the function SDL_GL_CreateContext fails (or more
specifically, glXMakeCurrent fails) with an X11 BadMatch error:
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 128 (GLX)
Minor opcode of failed request: 5 (X_GLXMakeCurrent)
Serial number of failed request: 153
Current serial number in output stream: 153
Also note that if I do not specify the alpha buffer size, the program works for
OpenGL 2.0 and OpenGL 3.2.
After some further analysis, I believe I have found the problem. The specific
issue is in:
SDL_x11opengl.c::X11_GL_CreateContext.
Note that for OpenGL 3.2 contexts, the GLXFBConfig to use is chosen as the best
match from glXChooseFBConfig. However, opengl attributes originally set with
SDL_GL_SetAttribute are not mapped to GLX attributes and then passed to the
glXChooseFBConfig function. According to the GLX 1.4 specification, if the
attributes are not specified, the function falls back to defaults (which, in
this particular case, prefer alpha channel size == 0).
For testing purposes, I modified the call to glXChooseFBConfig to look
something like this:
int glxAttribs[] =
{
GLX_RED_SIZE,8,
GLX_GREEN_SIZE,8,
GLX_BLUE_SIZE,8,
GLX_ALPHA_SIZE,8,
None
};
if (!glXChooseFBConfig ||
!(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display),
glxAttribs, &fbcount)))
{
...
}
The best match GLXFBConfig then supports 8 bit alpha channel. The program then
works as intended.
Hope this helps!
2011-02-24 17:52:47 -08:00
|
|
|
int glxAttribs[64];
|
|
|
|
|
2009-04-03 17:19:05 +00:00
|
|
|
/* Create a GL 3.x context */
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
GLXFBConfig *framebuffer_config = NULL;
|
2009-05-23 22:41:08 +00:00
|
|
|
int fbcount = 0;
|
|
|
|
GLXFBConfig *(*glXChooseFBConfig) (Display * disp,
|
|
|
|
int screen,
|
|
|
|
const int *attrib_list,
|
|
|
|
int *nelements);
|
|
|
|
|
|
|
|
glXChooseFBConfig =
|
|
|
|
(GLXFBConfig *
|
|
|
|
(*)(Display *, int, const int *,
|
|
|
|
int *)) _this->gl_data->
|
|
|
|
glXGetProcAddress((GLubyte *) "glXChooseFBConfig");
|
|
|
|
|
2012-02-20 23:37:57 -05:00
|
|
|
X11_GL_GetAttributes(_this,display,screen,glxAttribs,64,SDL_TRUE);
|
Fixed bug 1145 (GL Context creation fails for OpenGL 3.2 + Alpha buffer with X11 BadMatch)
Matthias 2011-02-23 09:37:51 PST
Please view the attached source file. Using this minimal program (as attached),
it creates an OpenGL 2.0 context with a cleared color buffer. If I set the
OpenGL version to 3.2, the function SDL_GL_CreateContext fails (or more
specifically, glXMakeCurrent fails) with an X11 BadMatch error:
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 128 (GLX)
Minor opcode of failed request: 5 (X_GLXMakeCurrent)
Serial number of failed request: 153
Current serial number in output stream: 153
Also note that if I do not specify the alpha buffer size, the program works for
OpenGL 2.0 and OpenGL 3.2.
After some further analysis, I believe I have found the problem. The specific
issue is in:
SDL_x11opengl.c::X11_GL_CreateContext.
Note that for OpenGL 3.2 contexts, the GLXFBConfig to use is chosen as the best
match from glXChooseFBConfig. However, opengl attributes originally set with
SDL_GL_SetAttribute are not mapped to GLX attributes and then passed to the
glXChooseFBConfig function. According to the GLX 1.4 specification, if the
attributes are not specified, the function falls back to defaults (which, in
this particular case, prefer alpha channel size == 0).
For testing purposes, I modified the call to glXChooseFBConfig to look
something like this:
int glxAttribs[] =
{
GLX_RED_SIZE,8,
GLX_GREEN_SIZE,8,
GLX_BLUE_SIZE,8,
GLX_ALPHA_SIZE,8,
None
};
if (!glXChooseFBConfig ||
!(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display),
glxAttribs, &fbcount)))
{
...
}
The best match GLXFBConfig then supports 8 bit alpha channel. The program then
works as intended.
Hope this helps!
2011-02-24 17:52:47 -08:00
|
|
|
|
2009-05-23 22:41:08 +00:00
|
|
|
if (!glXChooseFBConfig
|
|
|
|
|| !(framebuffer_config =
|
|
|
|
glXChooseFBConfig(display,
|
Fixed bug 1145 (GL Context creation fails for OpenGL 3.2 + Alpha buffer with X11 BadMatch)
Matthias 2011-02-23 09:37:51 PST
Please view the attached source file. Using this minimal program (as attached),
it creates an OpenGL 2.0 context with a cleared color buffer. If I set the
OpenGL version to 3.2, the function SDL_GL_CreateContext fails (or more
specifically, glXMakeCurrent fails) with an X11 BadMatch error:
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 128 (GLX)
Minor opcode of failed request: 5 (X_GLXMakeCurrent)
Serial number of failed request: 153
Current serial number in output stream: 153
Also note that if I do not specify the alpha buffer size, the program works for
OpenGL 2.0 and OpenGL 3.2.
After some further analysis, I believe I have found the problem. The specific
issue is in:
SDL_x11opengl.c::X11_GL_CreateContext.
Note that for OpenGL 3.2 contexts, the GLXFBConfig to use is chosen as the best
match from glXChooseFBConfig. However, opengl attributes originally set with
SDL_GL_SetAttribute are not mapped to GLX attributes and then passed to the
glXChooseFBConfig function. According to the GLX 1.4 specification, if the
attributes are not specified, the function falls back to defaults (which, in
this particular case, prefer alpha channel size == 0).
For testing purposes, I modified the call to glXChooseFBConfig to look
something like this:
int glxAttribs[] =
{
GLX_RED_SIZE,8,
GLX_GREEN_SIZE,8,
GLX_BLUE_SIZE,8,
GLX_ALPHA_SIZE,8,
None
};
if (!glXChooseFBConfig ||
!(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display),
glxAttribs, &fbcount)))
{
...
}
The best match GLXFBConfig then supports 8 bit alpha channel. The program then
works as intended.
Hope this helps!
2011-02-24 17:52:47 -08:00
|
|
|
DefaultScreen(display), glxAttribs,
|
2009-05-23 22:41:08 +00:00
|
|
|
&fbcount))) {
|
|
|
|
SDL_SetError
|
|
|
|
("No good framebuffers found. GL 3.x disabled");
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
context = temp_context;
|
2009-05-23 22:41:08 +00:00
|
|
|
} else {
|
|
|
|
context =
|
|
|
|
glXCreateContextAttribs(display,
|
|
|
|
framebuffer_config[0],
|
|
|
|
NULL, True, attribs);
|
|
|
|
_this->gl_data->glXDestroyContext(display,
|
|
|
|
temp_context);
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-07-28 08:43:17 +00:00
|
|
|
XFree(vinfo);
|
|
|
|
}
|
|
|
|
XSync(display, False);
|
|
|
|
|
|
|
|
if (!context) {
|
|
|
|
SDL_SetError("Could not create GL context");
|
2007-07-12 06:31:36 +00:00
|
|
|
return NULL;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
2007-07-12 06:31:36 +00:00
|
|
|
|
|
|
|
if (X11_GL_MakeCurrent(_this, window, context) < 0) {
|
|
|
|
X11_GL_DeleteContext(_this, context);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return context;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
X11_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
|
|
|
|
{
|
|
|
|
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
|
|
|
|
Window drawable =
|
2010-01-21 06:21:52 +00:00
|
|
|
(window ? ((SDL_WindowData *) window->driverdata)->xwindow : None);
|
2006-07-28 08:43:17 +00:00
|
|
|
GLXContext glx_context = (GLXContext) context;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
status = 0;
|
|
|
|
if (!_this->gl_data->glXMakeCurrent(display, drawable, glx_context)) {
|
|
|
|
SDL_SetError("Unable to make GL context current");
|
|
|
|
status = -1;
|
|
|
|
}
|
|
|
|
XSync(display, False);
|
|
|
|
|
|
|
|
return (status);
|
|
|
|
}
|
|
|
|
|
2008-03-07 23:57:15 +00:00
|
|
|
/*
|
2011-07-18 14:34:19 -07:00
|
|
|
0 is a valid argument to glxSwapInterval(MESA|EXT) and setting it to 0
|
|
|
|
will undo the effect of a previous call with a value that is greater
|
|
|
|
than zero (or at least that is what the docs say). OTOH, 0 is an invalid
|
|
|
|
argument to glxSwapIntervalSGI and it returns an error if you call it
|
|
|
|
with 0 as an argument.
|
2008-03-07 23:57:15 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
static int swapinterval = -1;
|
2006-07-28 08:43:17 +00:00
|
|
|
int
|
|
|
|
X11_GL_SetSwapInterval(_THIS, int interval)
|
|
|
|
{
|
|
|
|
int status;
|
|
|
|
|
2011-07-18 14:34:19 -07:00
|
|
|
if (_this->gl_data->glXSwapIntervalEXT) {
|
|
|
|
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
|
|
|
|
const SDL_WindowData *windowdata = (SDL_WindowData *)
|
|
|
|
_this->current_glwin->driverdata;
|
|
|
|
Window drawable = windowdata->xwindow;
|
2011-08-22 02:26:11 -04:00
|
|
|
status = _this->gl_data->glXSwapIntervalEXT(display,drawable,interval);
|
|
|
|
if (status != 0) {
|
|
|
|
SDL_SetError("glxSwapIntervalEXT failed");
|
|
|
|
status = -1;
|
|
|
|
} else {
|
|
|
|
swapinterval = interval;
|
|
|
|
}
|
2011-07-18 14:34:19 -07:00
|
|
|
} else if (_this->gl_data->glXSwapIntervalMESA) {
|
2006-07-28 08:43:17 +00:00
|
|
|
status = _this->gl_data->glXSwapIntervalMESA(interval);
|
|
|
|
if (status != 0) {
|
|
|
|
SDL_SetError("glxSwapIntervalMESA failed");
|
|
|
|
status = -1;
|
2008-03-07 23:57:15 +00:00
|
|
|
} else {
|
|
|
|
swapinterval = interval;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
} else if (_this->gl_data->glXSwapIntervalSGI) {
|
|
|
|
status = _this->gl_data->glXSwapIntervalSGI(interval);
|
|
|
|
if (status != 0) {
|
|
|
|
SDL_SetError("glxSwapIntervalSGI failed");
|
|
|
|
status = -1;
|
2008-03-07 23:57:15 +00:00
|
|
|
} else {
|
|
|
|
swapinterval = interval;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
SDL_Unsupported();
|
|
|
|
status = -1;
|
|
|
|
}
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
X11_GL_GetSwapInterval(_THIS)
|
|
|
|
{
|
2011-07-18 14:34:19 -07:00
|
|
|
if (_this->gl_data->glXSwapIntervalEXT) {
|
|
|
|
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
|
|
|
|
const SDL_WindowData *windowdata = (SDL_WindowData *)
|
|
|
|
_this->current_glwin->driverdata;
|
|
|
|
Window drawable = windowdata->xwindow;
|
|
|
|
unsigned int value = 0;
|
|
|
|
_this->gl_data->glXQueryDrawable(display, drawable,
|
|
|
|
GLX_SWAP_INTERVAL_EXT, &value);
|
|
|
|
return (int) value;
|
|
|
|
} else if (_this->gl_data->glXGetSwapIntervalMESA) {
|
2006-07-28 08:43:17 +00:00
|
|
|
return _this->gl_data->glXGetSwapIntervalMESA();
|
|
|
|
} else {
|
2008-03-07 23:57:15 +00:00
|
|
|
return swapinterval;
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
X11_GL_SwapWindow(_THIS, SDL_Window * window)
|
|
|
|
{
|
|
|
|
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
|
|
|
|
Display *display = data->videodata->display;
|
|
|
|
|
2010-01-21 06:21:52 +00:00
|
|
|
_this->gl_data->glXSwapBuffers(display, data->xwindow);
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
X11_GL_DeleteContext(_THIS, SDL_GLContext context)
|
|
|
|
{
|
|
|
|
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
|
|
|
|
GLXContext glx_context = (GLXContext) context;
|
|
|
|
|
|
|
|
_this->gl_data->glXDestroyContext(display, glx_context);
|
2008-03-07 17:20:37 +00:00
|
|
|
XSync(display, False);
|
2006-07-28 08:43:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* SDL_VIDEO_OPENGL_GLX */
|
|
|
|
|
2011-10-31 05:56:58 -04:00
|
|
|
#endif /* SDL_VIDEO_DRIVER_X11 */
|
|
|
|
|
2006-07-28 08:43:17 +00:00
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|