Mercurial > sdl-ios-xcode
changeset 3100:7dc982143c06
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.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 24 Mar 2009 10:43:53 +0000 |
| parents | 82e60908fab1 |
| children | 7b1da3f37f97 |
| files | include/SDL_video.h src/video/SDL_sysvideo.h src/video/SDL_video.c src/video/win32/SDL_win32opengl.c src/video/x11/SDL_x11opengl.c |
| diffstat | 5 files changed, 108 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/include/SDL_video.h Tue Mar 24 10:33:12 2009 +0000 +++ b/include/SDL_video.h Tue Mar 24 10:43:53 2009 +0000 @@ -270,7 +270,9 @@ SDL_GL_MULTISAMPLEBUFFERS, SDL_GL_MULTISAMPLESAMPLES, SDL_GL_ACCELERATED_VISUAL, - SDL_GL_RETAINED_BACKING + SDL_GL_RETAINED_BACKING, + SDL_GL_CONTEXT_MAJOR_VERSION, + SDL_GL_CONTEXT_MINOR_VERSION } SDL_GLattr;
--- a/src/video/SDL_sysvideo.h Tue Mar 24 10:33:12 2009 +0000 +++ b/src/video/SDL_sysvideo.h Tue Mar 24 10:43:53 2009 +0000 @@ -305,6 +305,8 @@ int multisamplebuffers; int multisamplesamples; int accelerated; + int major_version; + int minor_version; int retained_backing; int driver_loaded; char driver_path[256];
--- a/src/video/SDL_video.c Tue Mar 24 10:33:12 2009 +0000 +++ b/src/video/SDL_video.c Tue Mar 24 10:43:53 2009 +0000 @@ -257,6 +257,8 @@ _this->gl_config.multisamplesamples = 0; _this->gl_config.retained_backing = 1; _this->gl_config.accelerated = -1; /* not known, don't set */ + _this->gl_config.major_version = 2; + _this->gl_config.minor_version = 1; /* Initialize the video subsystem */ if (_this->VideoInit(_this) < 0) { @@ -2694,6 +2696,12 @@ case SDL_GL_RETAINED_BACKING: _this->gl_config.retained_backing = value; break; + case SDL_GL_CONTEXT_MAJOR_VERSION: + _this->gl_config.major_version = value; + break; + case SDL_GL_CONTEXT_MINOR_VERSION: + _this->gl_config.minor_version = value; + break; default: SDL_SetError("Unknown OpenGL attribute"); retval = -1;
--- a/src/video/win32/SDL_win32opengl.c Tue Mar 24 10:33:12 2009 +0000 +++ b/src/video/win32/SDL_win32opengl.c Tue Mar 24 10:43:53 2009 +0000 @@ -30,6 +30,17 @@ #define DEFAULT_OPENGL "OPENGL32.DLL" +#ifndef WGL_ARB_create_context +#define WGL_ARB_create_context +#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 +#define WGL_CONTEXT_FLAGS_ARB 0x2093 +#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 +#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 +#endif + +typedef HGLRC (APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int * attribList); int WIN_GL_LoadLibrary(_THIS, const char *path) @@ -485,7 +496,39 @@ HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc; HGLRC context; - context = _this->gl_data->wglCreateContext(hdc); + if (_this->gl_config.major_version < 3) { + context = _this->gl_data->wglCreateContext(hdc); + } else { + PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB; + HGLRC temp_context = _this->gl_data->wglCreateContext(hdc); + if (!temp_context) { + SDL_SetError("Could not create GL context"); + return NULL; + } + + /* Make the context current */ + if (WIN_GL_MakeCurrent(_this, window, temp_context) < 0) { + WIN_GL_DeleteContext(_this, temp_context); + return NULL; + } + + wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress("wglCreateContextAttribsARB"); + if (!wglCreateContextAttribsARB) { + SDL_SetError("GL 3.x is not supported"); + context = temp_context; + } else { + int attribs[] = { + WGL_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version, + WGL_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version, + 0 + }; + /* Create the GL 3.x context */ + context = wglCreateContextAttribsARB(hdc, 0, attribs); + /* Delete the GL 2.x context */ + wglDeleteContext(temp_context); + } + } + if (!context) { SDL_SetError("Could not create GL context"); return NULL;
--- a/src/video/x11/SDL_x11opengl.c Tue Mar 24 10:33:12 2009 +0000 +++ b/src/video/x11/SDL_x11opengl.c Tue Mar 24 10:43:53 2009 +0000 @@ -53,6 +53,15 @@ #define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D #endif +#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 +#endif + #define OPENGL_REQUIRS_DLOPEN #if defined(OPENGL_REQUIRS_DLOPEN) && defined(SDL_LOADSO_DLOPEN) #include <dlfcn.h> @@ -67,6 +76,9 @@ static void X11_GL_InitExtensions(_THIS); +/* 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); + int X11_GL_LoadLibrary(_THIS, const char *path) { @@ -270,10 +282,9 @@ /* 64 seems nice. */ int attribs[64]; - int i; - + int i = 0; + /* Setup our GLX attributes according to the gl_config. */ - i = 0; attribs[i++] = GLX_RGBA; attribs[i++] = GLX_RED_SIZE; attribs[i++] = _this->gl_config.red_size; @@ -384,8 +395,43 @@ v.visualid = XVisualIDFromVisual(xattr.visual); vinfo = XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n); if (vinfo) { - context = - _this->gl_data->glXCreateContext(display, vinfo, NULL, True); + if (_this->gl_config.major_version < 3) { + 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 */ + GLXContext temp_context = _this->gl_data->glXCreateContext(display, vinfo, NULL, True); + if (!temp_context) { + SDL_SetError("Could not create GL context"); + return NULL; + } else { + int attribs[] = { + GLX_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version, + GLX_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version, + 0 + }; + + /* Get a pointer to the context creation function for GL 3.0 */ + PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress((GLubyte*)"glXCreateContextAttribsARB"); + if (!glXCreateContextAttribs) { + SDL_SetError("GL 3.x is not supported"); + context = temp_context; + } else { + /* Create a GL 3.0 context */ + GLXFBConfig *framebuffer_config = NULL; + int fbcount = 0; + framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display), NULL, &fbcount); + if (!framebuffer_config) { + SDL_SetError("No good framebuffers found. GL 3.0 disabled"); + context = temp_context; + } else { + context = glXCreateContextAttribs(display, framebuffer_config[0], NULL, True, attribs); + glXDestroyContext(display, temp_context); + } + } + } + } XFree(vinfo); } XSync(display, False);