sdl-ios-xcode: src/video/x11/SDL

annotate src/video/x11/SDL_x11opengl.c @ 3105:cdeee9f9b14b

Fixed bug #721 From michalziulek@gmail.com 2009-03-28 07:43:34 (-) [reply] There is a bug in OpenGL 3.x context creation code. Function glXGetProcAddress is used directly where it should be: _this->gl_data->glXGetProcAddress. I have attached patch which fixes this on x11 and win32. Thanks.

author	Sam Lantinga <slouken@libsdl.org>
date	Fri, 03 Apr 2009 17:19:05 +0000
parents	7dc982143c06
children	7f684f249ec9

rev	line source
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with _this library; if not, write to the Free Software
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #include "SDL_x11video.h"
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 /* GLX implementation of SDL OpenGL support */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 #if SDL_VIDEO_OPENGL_GLX
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 #include "SDL_loadso.h"
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 #if defined(__IRIX__)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 /* IRIX doesn't have a GL library versioning system */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33 #define DEFAULT_OPENGL "libGL.so"
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 #elif defined(__MACOSX__)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 #define DEFAULT_OPENGL "/usr/X11R6/lib/libGL.1.dylib"
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36 #elif defined(__QNXNTO__)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 #define DEFAULT_OPENGL "libGL.so.3"
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 #else
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 #define DEFAULT_OPENGL "libGL.so.1"
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 #endif
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42 #ifndef GLX_ARB_multisample
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 #define GLX_ARB_multisample
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44 #define GLX_SAMPLE_BUFFERS_ARB 100000
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 #define GLX_SAMPLES_ARB 100001
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 #endif
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 #ifndef GLX_EXT_visual_rating
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 #define GLX_EXT_visual_rating
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 #define GLX_VISUAL_CAVEAT_EXT 0x20
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 #define GLX_NONE_EXT 0x8000
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 #define GLX_SLOW_VISUAL_EXT 0x8001
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 #define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54 #endif
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55
3100 7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	56 #ifndef GLX_ARB_create_context
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	57 #define GLX_ARB_create_context
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	58 #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	59 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	60 #define GLX_CONTEXT_FLAGS_ARB 0x2094
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	61 #define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	62 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	63 #endif
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	64
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 #define OPENGL_REQUIRS_DLOPEN
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 #if defined(OPENGL_REQUIRS_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 #include <dlfcn.h>
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 #define GL_LoadObject(X) dlopen(X, (RTLD_NOW\|RTLD_GLOBAL))
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69 #define GL_LoadFunction dlsym
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 #define GL_UnloadObject dlclose
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 #else
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 #define GL_LoadObject SDL_LoadObject
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 #define GL_LoadFunction SDL_LoadFunction
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 #define GL_UnloadObject SDL_UnloadObject
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75 #endif
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76
3057 089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	77 static void X11_GL_InitExtensions(_THIS);
2322 c25d45b7add3 Fixing valgrind errors. Bob Pendleton <bob@pendleton.com> parents: 2320 diff changeset	78
3100 7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	79 /* Typedef for the GL 3.0 context creation function */
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	80 typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int attrib_list);
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	81
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 int
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 X11_GL_LoadLibrary(_THIS, const char *path)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 void *handle;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86
3057 089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	87 /* Load the OpenGL library */
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	88 if (path == NULL) {
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	89 path = SDL_getenv("SDL_OPENGL_LIBRARY");
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	90 }
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	91 if (path == NULL) {
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	92 path = DEFAULT_OPENGL;
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	93 }
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	94 _this->gl_config.dll_handle = SDL_LoadObject(path);
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	95 if (!_this->gl_config.dll_handle) {
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	96 return -1;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 }
3057 089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	98 SDL_strlcpy(_this->gl_config.driver_path, path,
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	99 SDL_arraysize(_this->gl_config.driver_path));
2244 5234868559fa indent Sam Lantinga <slouken@libsdl.org> parents: 2243 diff changeset	100
3057 089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	101 /* Allocate OpenGL memory */
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	102 _this->gl_data =
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	103 (struct SDL_GLDriverData *) SDL_calloc(1,
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	104 sizeof(struct
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	105 SDL_GLDriverData));
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	106 if (!_this->gl_data) {
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	107 SDL_OutOfMemory();
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	108 return -1;
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	109 }
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	110
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	111 /* Load function pointers */
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	112 handle = _this->gl_config.dll_handle;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 _this->gl_data->glXGetProcAddress =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 (void ()(const GLubyte *)) GL_LoadFunction(handle,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 "glXGetProcAddressARB");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 _this->gl_data->glXChooseVisual =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 (XVisualInfo * ()(Display , int, int *)) GL_LoadFunction(handle,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 "glXChooseVisual");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 _this->gl_data->glXCreateContext =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 (GLXContext()(Display , XVisualInfo *, GLXContext, int))
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 GL_LoadFunction(handle, "glXCreateContext");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 _this->gl_data->glXDestroyContext =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 (void ()(Display , GLXContext)) GL_LoadFunction(handle,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 "glXDestroyContext");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 _this->gl_data->glXMakeCurrent =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 (int ()(Display , GLXDrawable, GLXContext)) GL_LoadFunction(handle,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 "glXMakeCurrent");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 _this->gl_data->glXSwapBuffers =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 (void ()(Display , GLXDrawable)) GL_LoadFunction(handle,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 "glXSwapBuffers");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 if (!_this->gl_data->glXChooseVisual \|\|
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 !_this->gl_data->glXCreateContext \|\|
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 !_this->gl_data->glXDestroyContext \|\|
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1955 diff changeset	135 !_this->gl_data->glXMakeCurrent \|\| !_this->gl_data->glXSwapBuffers) {
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136 SDL_SetError("Could not retrieve OpenGL functions");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 return -1;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139
3057 089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	140 /* Initialize extensions */
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	141 X11_GL_InitExtensions(_this);
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	142
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143 return 0;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 void *
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147 X11_GL_GetProcAddress(_THIS, const char *proc)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	148 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 void *handle;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	150
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151 handle = _this->gl_config.dll_handle;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 if (_this->gl_data->glXGetProcAddress) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 return _this->gl_data->glXGetProcAddress((const GLubyte *) proc);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155 return GL_LoadFunction(handle, proc);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157
3057 089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	158 void
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159 X11_GL_UnloadLibrary(_THIS)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160 {
3057 089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	161 /* Don't actually unload the library, since it may have registered
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	162 * X11 shutdown hooks, per the notes at:
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	163 * http://dri.sourceforge.net/doc/DRIuserguide.html
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	164 */
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	165 #if 0
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	166 GL_UnloadObject(_this->gl_config.dll_handle);
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	167 _this->gl_config.dll_handle = NULL;
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	168 #endif
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	169
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	170 /* Free OpenGL memory */
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	171 SDL_free(_this->gl_data);
089a77aebb7d Added test program for SDL_CreateWindowFrom() Sam Lantinga <slouken@libsdl.org> parents: 3013 diff changeset	172 _this->gl_data = NULL;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	174
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	175 static SDL_bool
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176 HasExtension(const char extension, const char extensions)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	177 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178 const char *start;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 const char where, terminator;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181 /* Extension names should not have spaces. */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 where = SDL_strchr(extension, ' ');
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183 if (where \|\| *extension == '\0')
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184 return SDL_FALSE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186 if (!extensions)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	187 return SDL_FALSE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	188
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	189 /* It takes a bit of care to be fool-proof about parsing the
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	190 * OpenGL extensions string. Don't be fooled by sub-strings,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	191 * etc. */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	192
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	193 start = extensions;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	194
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	195 for (;;) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	196 where = SDL_strstr(start, extension);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	197 if (!where)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	198 break;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	199
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	200 terminator = where + SDL_strlen(extension);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	201 if (where == start \|\| *(where - 1) == ' ')
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	202 if (terminator == ' ' \|\| terminator == '\0')
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	203 return SDL_TRUE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	204
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	205 start = terminator;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	206 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	207 return SDL_FALSE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	208 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	209
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	210 static void
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	211 X11_GL_InitExtensions(_THIS)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	212 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	213 Display display = ((SDL_VideoData ) _this->driverdata)->display;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	214 int screen = ((SDL_DisplayData *) SDL_CurrentDisplay.driverdata)->screen;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	215 XVisualInfo *vinfo;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	216 XSetWindowAttributes xattr;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217 Window w;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 GLXContext context;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219 const char (glXQueryExtensionsStringFunc) (Display *, int);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 const char *extensions;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 vinfo = X11_GL_GetVisual(_this, display, screen);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 if (!vinfo) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224 return;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	225 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	226 xattr.background_pixel = 0;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	227 xattr.border_pixel = 0;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 xattr.colormap =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229 XCreateColormap(display, RootWindow(display, screen), vinfo->visual,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 AllocNone);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 w = XCreateWindow(display, RootWindow(display, screen), 0, 0, 32, 32, 0,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	232 vinfo->depth, InputOutput, vinfo->visual,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 (CWBackPixel \| CWBorderPixel \| CWColormap), &xattr);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234 context = _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	235 if (context) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	236 _this->gl_data->glXMakeCurrent(display, w, context);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	237 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	238 XFree(vinfo);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240 glXQueryExtensionsStringFunc =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241 (const char ()(Display *, int)) X11_GL_GetProcAddress(_this,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242 "glXQueryExtensionsString");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 if (glXQueryExtensionsStringFunc) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	244 extensions = glXQueryExtensionsStringFunc(display, screen);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	245 } else {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	246 extensions = NULL;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	247 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	248
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	249 /* Check for SGI_swap_control */
2105 12bcd4fd2606 Date: Wed, 23 May 2007 00:39:47 +0300 Ryan C. Gordon <icculus@icculus.org> parents: 1956 diff changeset	250 if (HasExtension("GLX_SGI_swap_control", extensions)) {
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 _this->gl_data->glXSwapIntervalSGI =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	252 (int (*)(int)) X11_GL_GetProcAddress(_this, "glXSwapIntervalSGI");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	253 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	255 /* Check for GLX_MESA_swap_control */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	256 if (HasExtension("GLX_MESA_swap_control", extensions)) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	257 _this->gl_data->glXSwapIntervalMESA =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	258 (GLint(*)(unsigned)) X11_GL_GetProcAddress(_this,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	259 "glXSwapIntervalMESA");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	260 _this->gl_data->glXGetSwapIntervalMESA =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	261 (GLint(*)(void)) X11_GL_GetProcAddress(_this,
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 "glXGetSwapIntervalMESA");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	263 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	264
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 /* Check for GLX_EXT_visual_rating */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 if (HasExtension("GLX_EXT_visual_rating", extensions)) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 _this->gl_data->HAS_GLX_EXT_visual_rating = SDL_TRUE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 if (context) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	271 _this->gl_data->glXMakeCurrent(display, None, NULL);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	272 _this->gl_data->glXDestroyContext(display, context);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	273 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	274 XDestroyWindow(display, w);
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	275 X11_PumpEvents(_this);
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	276 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	277
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	278 XVisualInfo *
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	279 X11_GL_GetVisual(_THIS, Display * display, int screen)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	280 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	281 XVisualInfo *vinfo;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	282
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	283 /* 64 seems nice. */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	284 int attribs[64];
3100 7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	285 int i = 0;
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	286
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	287 /* Setup our GLX attributes according to the gl_config. */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	288 attribs[i++] = GLX_RGBA;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	289 attribs[i++] = GLX_RED_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	290 attribs[i++] = _this->gl_config.red_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	291 attribs[i++] = GLX_GREEN_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	292 attribs[i++] = _this->gl_config.green_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	293 attribs[i++] = GLX_BLUE_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	294 attribs[i++] = _this->gl_config.blue_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	295
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	296 if (_this->gl_config.alpha_size) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	297 attribs[i++] = GLX_ALPHA_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	298 attribs[i++] = _this->gl_config.alpha_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	299 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	300
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	301 if (_this->gl_config.buffer_size) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	302 attribs[i++] = GLX_BUFFER_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	303 attribs[i++] = _this->gl_config.buffer_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	304 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	305
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	306 if (_this->gl_config.double_buffer) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	307 attribs[i++] = GLX_DOUBLEBUFFER;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	308 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	309
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	310 attribs[i++] = GLX_DEPTH_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	311 attribs[i++] = _this->gl_config.depth_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	312
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	313 if (_this->gl_config.stencil_size) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	314 attribs[i++] = GLX_STENCIL_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	315 attribs[i++] = _this->gl_config.stencil_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	316 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	317
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	318 if (_this->gl_config.accum_red_size) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	319 attribs[i++] = GLX_ACCUM_RED_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	320 attribs[i++] = _this->gl_config.accum_red_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	321 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	322
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	323 if (_this->gl_config.accum_green_size) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	324 attribs[i++] = GLX_ACCUM_GREEN_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	325 attribs[i++] = _this->gl_config.accum_green_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	326 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	327
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	328 if (_this->gl_config.accum_blue_size) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	329 attribs[i++] = GLX_ACCUM_BLUE_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	330 attribs[i++] = _this->gl_config.accum_blue_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	331 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	332
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	333 if (_this->gl_config.accum_alpha_size) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	334 attribs[i++] = GLX_ACCUM_ALPHA_SIZE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	335 attribs[i++] = _this->gl_config.accum_alpha_size;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	336 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	337
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	338 if (_this->gl_config.stereo) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	339 attribs[i++] = GLX_STEREO;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	340 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	341
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	342 if (_this->gl_config.multisamplebuffers) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	343 attribs[i++] = GLX_SAMPLE_BUFFERS_ARB;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	344 attribs[i++] = _this->gl_config.multisamplebuffers;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	345 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	346
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	347 if (_this->gl_config.multisamplesamples) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	348 attribs[i++] = GLX_SAMPLES_ARB;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	349 attribs[i++] = _this->gl_config.multisamplesamples;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	350 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	351
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	352 if (_this->gl_config.accelerated >= 0
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	353 && _this->gl_data->HAS_GLX_EXT_visual_rating) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	354 attribs[i++] = GLX_VISUAL_CAVEAT_EXT;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355 attribs[i++] = GLX_NONE_EXT;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357 #ifdef GLX_DIRECT_COLOR /* Try for a DirectColor visual for gamma support */
2963 ee331407574f Don't use DirectColor visuals until we implement DirectColor colormap support Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	358 if (X11_UseDirectColorVisuals()) {
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359 attribs[i++] = GLX_X_VISUAL_TYPE;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 attribs[i++] = GLX_DIRECT_COLOR;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	361 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362 #endif
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	363 attribs[i++] = None;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 vinfo = _this->gl_data->glXChooseVisual(display, screen, attribs);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 #ifdef GLX_DIRECT_COLOR
2963 ee331407574f Don't use DirectColor visuals until we implement DirectColor colormap support Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	367 if (!vinfo && X11_UseDirectColorVisuals()) { /* No DirectColor visual? Try again.. */
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 attribs[i - 3] = None;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369 vinfo = _this->gl_data->glXChooseVisual(display, screen, attribs);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 #endif
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 if (!vinfo) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	373 SDL_SetError("Couldn't find matching GLX visual");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	374 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	375 return vinfo;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	376 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	377
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	378 SDL_GLContext
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	379 X11_GL_CreateContext(_THIS, SDL_Window * window)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	380 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	381 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	382 Display *display = data->videodata->display;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	383 int screen =
3013 8cc00819c8d6 Reverted Bob's indent checkin Sam Lantinga <slouken@libsdl.org> parents: 3011 diff changeset	384 ((SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->
8cc00819c8d6 Reverted Bob's indent checkin Sam Lantinga <slouken@libsdl.org> parents: 3011 diff changeset	385 driverdata)->screen;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	386 XWindowAttributes xattr;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	387 XVisualInfo v, *vinfo;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	388 int n;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	389 GLXContext context = NULL;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	390
1955 8c6106e45fc1 Sam Lantinga <slouken@libsdl.org> parents: 1954 diff changeset	391 /* We do this to create a clean separation between X and GLX errors. */
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	392 XSync(display, False);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	393 XGetWindowAttributes(display, data->window, &xattr);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	394 v.screen = screen;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	395 v.visualid = XVisualIDFromVisual(xattr.visual);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	396 vinfo = XGetVisualInfo(display, VisualScreenMask \| VisualIDMask, &v, &n);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	397 if (vinfo) {
3100 7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	398 if (_this->gl_config.major_version < 3) {
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	399 context =
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	400 _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	401 } else {
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	402 /* If we want a GL 3.0 context or later we need to get a temporary
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	403 context to grab the new context creation function */
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	404 GLXContext temp_context = _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	405 if (!temp_context) {
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	406 SDL_SetError("Could not create GL context");
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	407 return NULL;
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	408 } else {
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	409 int attribs[] = {
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	410 GLX_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version,
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	411 GLX_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version,
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	412 0
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	413 };
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	414
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	415 /* Get a pointer to the context creation function for GL 3.0 */
3105 cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	416 PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs = (PFNGLXCREATECONTEXTATTRIBSARBPROC)_this->gl_data->glXGetProcAddress((GLubyte*)"glXCreateContextAttribsARB");
3100 7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	417 if (!glXCreateContextAttribs) {
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	418 SDL_SetError("GL 3.x is not supported");
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	419 context = temp_context;
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	420 } else {
3105 cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	421 /* Create a GL 3.x context */
3100 7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	422 GLXFBConfig *framebuffer_config = NULL;
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	423 int fbcount = 0;
3105 cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	424 GLXFBConfig* (glXChooseFBConfig)(Display disp, int screen, const int* attrib_list, int* nelements);
cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	425
cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	426 glXChooseFBConfig = (GLXFBConfig* ()(Display, int, const int, int))_this->gl_data->glXGetProcAddress((GLubyte*)"glXChooseFBConfig");
cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	427
cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	428 if (!glXChooseFBConfig \|\| !(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display), NULL, &fbcount))) {
cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	429 SDL_SetError("No good framebuffers found. GL 3.x disabled");
3100 7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	430 context = temp_context;
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	431 } else {
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	432 context = glXCreateContextAttribs(display, framebuffer_config[0], NULL, True, attribs);
3105 cdeee9f9b14b Fixed bug #721 Sam Lantinga <slouken@libsdl.org> parents: 3100 diff changeset	433 _this->gl_data->glXDestroyContext(display, temp_context);
3100 7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	434 }
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	435 }
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	436 }
7dc982143c06 Date: Sun, 22 Mar 2009 12:52:29 +0000 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	437 }
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	438 XFree(vinfo);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	439 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	440 XSync(display, False);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	441
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	442 if (!context) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	443 SDL_SetError("Could not create GL context");
2178 114a541cfae2 Creating a context makes it current, per the documentation. Sam Lantinga <slouken@libsdl.org> parents: 2105 diff changeset	444 return NULL;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	445 }
2178 114a541cfae2 Creating a context makes it current, per the documentation. Sam Lantinga <slouken@libsdl.org> parents: 2105 diff changeset	446
114a541cfae2 Creating a context makes it current, per the documentation. Sam Lantinga <slouken@libsdl.org> parents: 2105 diff changeset	447 if (X11_GL_MakeCurrent(_this, window, context) < 0) {
114a541cfae2 Creating a context makes it current, per the documentation. Sam Lantinga <slouken@libsdl.org> parents: 2105 diff changeset	448 X11_GL_DeleteContext(_this, context);
114a541cfae2 Creating a context makes it current, per the documentation. Sam Lantinga <slouken@libsdl.org> parents: 2105 diff changeset	449 return NULL;
114a541cfae2 Creating a context makes it current, per the documentation. Sam Lantinga <slouken@libsdl.org> parents: 2105 diff changeset	450 }
114a541cfae2 Creating a context makes it current, per the documentation. Sam Lantinga <slouken@libsdl.org> parents: 2105 diff changeset	451
114a541cfae2 Creating a context makes it current, per the documentation. Sam Lantinga <slouken@libsdl.org> parents: 2105 diff changeset	452 return context;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	453 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	454
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	455 int
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	456 X11_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	457 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	458 Display display = ((SDL_VideoData ) _this->driverdata)->display;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	459 Window drawable =
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 (window ? ((SDL_WindowData *) window->driverdata)->window : None);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	461 GLXContext glx_context = (GLXContext) context;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	462 int status;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	463
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	464 status = 0;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	465 if (!_this->gl_data->glXMakeCurrent(display, drawable, glx_context)) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	466 SDL_SetError("Unable to make GL context current");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	467 status = -1;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	468 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	469 XSync(display, False);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	470
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471 return (status);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	473
2327 7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	474 /*
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	475 0 is a valid argument to glxSwapIntervalMESA and setting it to 0
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	476 with the MESA version of the extension will undo the effect of a
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	477 previous call with a value that is greater than zero (or at least
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	478 that is what the FM says. OTOH, 0 is an invalid argument to
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	479 glxSwapIntervalSGI and it returns an error if you call it with 0 as
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	480 an argument.
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	481 */
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	482
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	483 static int swapinterval = -1;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484 int
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	485 X11_GL_SetSwapInterval(_THIS, int interval)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	486 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	487 int status;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	488
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	489 if (_this->gl_data->glXSwapIntervalMESA) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	490 status = _this->gl_data->glXSwapIntervalMESA(interval);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	491 if (status != 0) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	492 SDL_SetError("glxSwapIntervalMESA failed");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	493 status = -1;
2327 7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	494 } else {
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	495 swapinterval = interval;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	496 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	497 } else if (_this->gl_data->glXSwapIntervalSGI) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	498 status = _this->gl_data->glXSwapIntervalSGI(interval);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	499 if (status != 0) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	500 SDL_SetError("glxSwapIntervalSGI failed");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	501 status = -1;
2327 7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	502 } else {
7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	503 swapinterval = interval;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	504 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	505 } else {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	506 SDL_Unsupported();
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	507 status = -1;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	508 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	509 return status;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	510 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	512 int
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	513 X11_GL_GetSwapInterval(_THIS)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	515 if (_this->gl_data->glXGetSwapIntervalMESA) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	516 return _this->gl_data->glXGetSwapIntervalMESA();
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	517 } else {
2327 7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	518 return swapinterval;
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	520 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	521
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	522 void
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	523 X11_GL_SwapWindow(_THIS, SDL_Window * window)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	524 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	525 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	526 Display *display = data->videodata->display;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	527
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	528 _this->gl_data->glXSwapBuffers(display, data->window);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	529 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	530
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	531 void
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	532 X11_GL_DeleteContext(_THIS, SDL_GLContext context)
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	533 {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	534 Display display = ((SDL_VideoData ) _this->driverdata)->display;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	535 GLXContext glx_context = (GLXContext) context;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	536
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	537 _this->gl_data->glXDestroyContext(display, glx_context);
2324 3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	538 XSync(display, False);
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	539 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	540
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	541 #endif /* SDL_VIDEO_OPENGL_GLX */
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	542
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	543 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11opengl.c @ 3105:cdeee9f9b14b