We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] context creation patch

context.diff (text/plain), 11.08 KB, created by Matthias Bentrup on 2011-10-30 03:58:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Bentrup

Created: 2011-10-30 03:58:24 UTC

Size: 11.08 KB

patch

obsolete

>diff -r 2feab4874268 include/SDL_video.h
>--- a/include/SDL_video.h	Sun Oct 30 00:19:13 2011 -0700
>+++ b/include/SDL_video.h	Sun Oct 30 11:42:22 2011 +0100
>@@ -182,9 +182,25 @@
>     SDL_GL_ACCELERATED_VISUAL,
>     SDL_GL_RETAINED_BACKING,
>     SDL_GL_CONTEXT_MAJOR_VERSION,
>-    SDL_GL_CONTEXT_MINOR_VERSION
>+    SDL_GL_CONTEXT_MINOR_VERSION,
>+    SDL_GL_CONTEXT_FLAGS,
>+    SDL_GL_CONTEXT_PROFILE_MASK
> } SDL_GLattr;
> 
>+typedef enum
>+{
>+    SDL_GL_CONTEXT_PROFILE_CORE           = 0x0001,
>+    SDL_GL_CONTEXT_PROFILE_COMPATIBILITY  = 0x0002,
>+    SDL_GL_CONTEXT_PROFILE_ES2            = 0x0004
>+} SDL_GLprofile;
>+
>+typedef enum
>+{
>+    SDL_GL_CONTEXT_DEBUG_FLAG              = 0x0001,
>+    SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002,
>+    SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG      = 0x0004
>+} SDL_GLcontextFlag;
>+
> 
> /* Function prototypes */
> 
>diff -r 2feab4874268 src/video/SDL_sysvideo.h
>--- a/src/video/SDL_sysvideo.h	Sun Oct 30 00:19:13 2011 -0700
>+++ b/src/video/SDL_sysvideo.h	Sun Oct 30 11:42:22 2011 +0100
>@@ -270,6 +270,8 @@
>         int accelerated;
>         int major_version;
>         int minor_version;
>+        int flags;
>+        int profile_mask;
>         int retained_backing;
>         int driver_loaded;
>         char driver_path[256];
>diff -r 2feab4874268 src/video/SDL_video.c
>--- a/src/video/SDL_video.c	Sun Oct 30 00:19:13 2011 -0700
>+++ b/src/video/SDL_video.c	Sun Oct 30 11:42:22 2011 +0100
>@@ -491,6 +491,8 @@
>     _this->gl_config.major_version = 2;
>     _this->gl_config.minor_version = 0;
> #endif
>+    _this->gl_config.flags = 0;
>+    _this->gl_config.profile_mask = 0;
> 
>     /* Initialize the video subsystem */
>     if (_this->VideoInit(_this) < 0) {
>@@ -2276,6 +2278,12 @@
>     case SDL_GL_CONTEXT_MINOR_VERSION:
>         _this->gl_config.minor_version = value;
>         break;
>+    case SDL_GL_CONTEXT_FLAGS:
>+        _this->gl_config.flags = value;
>+        break;
>+    case SDL_GL_CONTEXT_PROFILE_MASK:
>+        _this->gl_config.profile_mask = value;
>+        break;
>     default:
>         SDL_SetError("Unknown OpenGL attribute");
>         retval = -1;
>@@ -2422,6 +2430,16 @@
>             *value = _this->gl_config.minor_version;
>             return 0;
>         }
>+    case SDL_GL_CONTEXT_FLAGS:
>+        {
>+            *value = _this->gl_config.flags;
>+            return 0;
>+        }
>+    case SDL_GL_CONTEXT_PROFILE_MASK:
>+        {
>+            *value = _this->gl_config.profile_mask;
>+            return 0;
>+        }
>     default:
>         SDL_SetError("Unknown OpenGL attribute");
>         return -1;
>diff -r 2feab4874268 src/video/windows/SDL_windowsopengl.c
>--- a/src/video/windows/SDL_windowsopengl.c	Sun Oct 30 00:19:13 2011 -0700
>+++ b/src/video/windows/SDL_windowsopengl.c	Sun Oct 30 11:42:22 2011 +0100
>@@ -37,6 +37,26 @@
> #define WGL_CONTEXT_FLAGS_ARB           0x2093
> #define WGL_CONTEXT_DEBUG_BIT_ARB       0x0001
> #define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB  0x0002
>+
>+#ifndef WGL_ARB_create_context_profile
>+#define WGL_ARB_create_context_profile
>+#define WGL_CONTEXT_PROFILE_MASK_ARB              0x9126
>+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB          0x00000001
>+#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
>+#endif
>+
>+#ifndef WGL_ARB_create_context_robustness
>+#define WGL_ARB_create_context_robustness
>+#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB         0x00000004
>+#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB     0x8256
>+#define WGL_NO_RESET_NOTIFICATION_ARB                   0x8261
>+#define WGL_LOSE_CONTEXT_ON_RESET_ARB                   0x8252
>+#endif
>+#endif
>+
>+#ifndef WGL_EXT_create_context_es2_profile
>+#define WGL_EXT_create_context_es2_profile
>+#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT           0x00000004
> #endif
> 
> typedef HGLRC(APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC,
>@@ -396,7 +416,7 @@
> {
>     HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc;
>     PIXELFORMATDESCRIPTOR pfd;
>-    int pixel_format;
>+    int pixel_format = 0;
>     int iAttribs[64];
>     int *iAttr;
>     float fAttribs[1] = { 0 };
>@@ -466,16 +486,19 @@
>         *iAttr++ = _this->gl_config.multisamplesamples;
>     }
> 
>-    if (_this->gl_config.accelerated >= 0) {
>-        *iAttr++ = WGL_ACCELERATION_ARB;
>-        *iAttr++ = (_this->gl_config.accelerated ? WGL_FULL_ACCELERATION_ARB :
>-                                                   WGL_NO_ACCELERATION_ARB);
>-    }
>+    *iAttr++ = WGL_ACCELERATION_ARB;
>+    *iAttr++ = WGL_FULL_ACCELERATION_ARB;
> 
>     *iAttr = 0;
> 
>     /* Choose and set the closest available pixel format */
>-    pixel_format = WIN_GL_ChoosePixelFormatARB(_this, iAttribs, fAttribs);
>+    if (_this->gl_config.accelerated != 0) {
>+        pixel_format = WIN_GL_ChoosePixelFormatARB(_this, iAttribs, fAttribs);
>+    }
>+    if (!pixel_format && _this->gl_config.accelerated != 1) {
>+        iAttr[-1] = WGL_NO_ACCELERATION_ARB;
>+	pixel_format = WIN_GL_ChoosePixelFormatARB(_this, iAttribs, fAttribs);
>+    }
>     if (!pixel_format) {
>         pixel_format = WIN_GL_ChoosePixelFormat(hdc, &pfd);
>     }
>@@ -519,11 +542,28 @@
>             SDL_SetError("GL 3.x is not supported");
>             context = temp_context;
>         } else {
>-            int attribs[] = {
>+	    /* max 8 attributes plus terminator */
>+            int attribs[9] = {
>                 WGL_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version,
>                 WGL_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version,
>                 0
>             };
>+	    int iattr = 4;
>+
>+	    /* SDL profile bits match WGL profile bits */
>+	    if( _this->gl_config.profile_mask != 0 ) {
>+	        attribs[iattr++] = WGL_CONTEXT_PROFILE_MASK_ARB;
>+		attribs[iattr++] = _this->gl_config.profile_mask;
>+	    }
>+
>+	    /* SDL flags match WGL flags */
>+	    if( _this->gl_config.flags != 0 ) {
>+	        attribs[iattr++] = WGL_CONTEXT_FLAGS_ARB;
>+		attribs[iattr++] = _this->gl_config.flags;
>+	    }
>+
>+	    attribs[iattr++] = 0;
>+
>             /* Create the GL 3.x context */
>             context = wglCreateContextAttribsARB(hdc, 0, attribs);
>             /* Delete the GL 2.x context */
>diff -r 2feab4874268 src/video/x11/SDL_x11opengl.c
>--- a/src/video/x11/SDL_x11opengl.c	Sun Oct 30 00:19:13 2011 -0700
>+++ b/src/video/x11/SDL_x11opengl.c	Sun Oct 30 11:42:22 2011 +0100
>@@ -19,8 +19,8 @@
>   3. This notice may not be removed or altered from any source distribution.
> */
> #include "SDL_config.h"
>+
> #include "SDL_x11video.h"
>-#include "SDL_assert.h"
> 
> /* GLX implementation of SDL OpenGL support */
> 
>@@ -64,11 +64,6 @@
> #define GLX_CONTEXT_DEBUG_BIT_ARB          0x0001
> #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
> 
>-#ifndef GLX_EXT_swap_control
>-#define GLX_SWAP_INTERVAL_EXT              0x20F1
>-#define GLX_MAX_SWAP_INTERVAL_EXT          0x20F2
>-#endif
>-
> /* Typedef for the GL 3.0 context creation function */
> typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display * dpy,
>                                                         GLXFBConfig config,
>@@ -77,6 +72,31 @@
>                                                         Bool direct,
>                                                         const int
>                                                         *attrib_list);
>+
>+#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
>+#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
> #endif
> 
> #define OPENGL_REQUIRS_DLOPEN
>@@ -297,8 +317,11 @@
>     X11_PumpEvents(_this);
> }
> 
>+/* glXChooseVisual and glXChooseFBConfig have some small differences in
>+ * the attribute encoding, it can be chosen with the for_FBConfig parameter. 
>+ */
> int 
>-X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int size)
>+X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int size, Bool for_FBConfig)
> {
>     int i = 0;
> 
>@@ -306,7 +329,12 @@
>     /* assert(size >= 32);*/
> 
>     /* Setup our GLX attributes according to the gl_config. */
>-    attribs[i++] = GLX_RGBA;
>+    if( for_FBConfig ) {
>+        attribs[i++] = GLX_RENDER_TYPE;
>+	attribs[i++] = GLX_RGBA_BIT;
>+    } else {
>+        attribs[i++] = GLX_RGBA;
>+    }
>     attribs[i++] = GLX_RED_SIZE;
>     attribs[i++] = _this->gl_config.red_size;
>     attribs[i++] = GLX_GREEN_SIZE;
>@@ -326,6 +354,8 @@
> 
>     if (_this->gl_config.double_buffer) {
>         attribs[i++] = GLX_DOUBLEBUFFER;
>+	if( for_FBConfig )
>+	    attribs[i++] = True;
>     }
> 
>     attribs[i++] = GLX_DEPTH_SIZE;
>@@ -358,6 +388,8 @@
> 
>     if (_this->gl_config.stereo) {
>         attribs[i++] = GLX_STEREO;
>+	if( for_FBConfig )
>+	    attribs[i++] = True;
>     }
> 
>     if (_this->gl_config.multisamplebuffers) {
>@@ -388,10 +420,8 @@
>     XVisualInfo *vinfo;
> 
>     /* 64 seems nice. */
>-    const int max_attrs = 64;
>-    int attribs[max_attrs];
>-    const int i = X11_GL_GetAttributes(_this,display,screen,attribs,max_attrs);
>-    SDL_assert(i <= max_attrs);
>+    int attribs[64];
>+    int i = X11_GL_GetAttributes(_this,display,screen,attribs,64,SDL_FALSE);
> 
>     vinfo = _this->gl_data->glXChooseVisual(display, screen, attribs);
>     if (!vinfo) {
>@@ -431,13 +461,29 @@
>                 SDL_SetError("Could not create GL context");
>                 return NULL;
>             } else {
>-                int attribs[] = {
>+	        /* max 8 attributes plus terminator */
>+                int attribs[9] = {
>                     GLX_CONTEXT_MAJOR_VERSION_ARB,
>                     _this->gl_config.major_version,
>                     GLX_CONTEXT_MINOR_VERSION_ARB,
>                     _this->gl_config.minor_version,
>                     0
>                 };
>+		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;
> 
>                 /* Get a pointer to the context creation function for GL 3.0 */
>                 PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs =
>@@ -464,7 +510,7 @@
>                              int *)) _this->gl_data->
>                         glXGetProcAddress((GLubyte *) "glXChooseFBConfig");
> 
>-                    X11_GL_GetAttributes(_this,display,screen,glxAttribs,64);
>+                    X11_GL_GetAttributes(_this,display,screen,glxAttribs,64,SDL_TRUE);
> 
>                     if (!glXChooseFBConfig
>                         || !(framebuffer_config =

Actions: View | Diff

Attachments on bug 776: 343 | 344 | 591 | 679 | 702 | 725

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.