diff src/video/win32/SDL_win32opengl.c @ 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 089a77aebb7d
children cdeee9f9b14b
line wrap: on
line diff
--- 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;