Commit 9a854263 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard

wgl: Add support for WGL_ARB_create_context_profile which is required for OpenGL 3.2.

parent 74ae7d35
...@@ -2249,6 +2249,10 @@ HGLRC X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareCon ...@@ -2249,6 +2249,10 @@ HGLRC X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareCon
pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB;
pContextAttribList[1] = pAttribList[1]; pContextAttribList[1] = pAttribList[1];
break; break;
case WGL_CONTEXT_PROFILE_MASK_ARB:
pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB;
pContextAttribList[1] = pAttribList[1];
break;
default: default:
ERR("Unhandled attribList pair: %#x %#x\n", pAttribList[0], pAttribList[1]); ERR("Unhandled attribList pair: %#x %#x\n", pAttribList[0], pAttribList[1]);
} }
...@@ -3540,6 +3544,9 @@ static void X11DRV_WineGL_LoadExtensions(void) ...@@ -3540,6 +3544,9 @@ static void X11DRV_WineGL_LoadExtensions(void)
if(glxRequireExtension("GLX_ARB_create_context")) if(glxRequireExtension("GLX_ARB_create_context"))
{ {
register_extension(&WGL_ARB_create_context); register_extension(&WGL_ARB_create_context);
if(glxRequireExtension("GLX_ARB_create_context_profile"))
register_extension_string("WGL_ARB_create_context_profile");
} }
if(glxRequireExtension("GLX_ARB_fbconfig_float")) if(glxRequireExtension("GLX_ARB_fbconfig_float"))
......
...@@ -200,7 +200,11 @@ ...@@ -200,7 +200,11 @@
#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
#define WGL_CONTEXT_FLAGS_ARB 0x2094 #define WGL_CONTEXT_FLAGS_ARB 0x2094
#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
#define ERROR_INVALID_VERSION_ARB 0x2095 #define ERROR_INVALID_VERSION_ARB 0x2095
#define ERROR_INVALID_PROFILE_ARB 0x2096
#ifndef GLX_ARB_create_context #ifndef GLX_ARB_create_context
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 #define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
...@@ -208,6 +212,11 @@ ...@@ -208,6 +212,11 @@
#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
#define GLX_CONTEXT_FLAGS_ARB 0x2094 #define GLX_CONTEXT_FLAGS_ARB 0x2094
#endif #endif
#ifndef 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
/** /**
* WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment