ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Implement WGL_ARB_create_context_no_error. 

Mostly because it's easy, and we'd like to use this from wined3d at some
point.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-01-24 17:33:22 +01:00 committed by Alexandre Julliard
parent 213bd4cffa
commit 3eaa23cbbf
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/opengl32/make_opengl
View File

@ -369,6 +369,7 @@ my %remapped_wgl_functions =
my %supported_wgl_extensions = my %supported_wgl_extensions =
( (
"WGL_ARB_create_context" => 1, "WGL_ARB_create_context" => 1,
"WGL_ARB_create_context_no_error" => 1,
"WGL_ARB_create_context_profile" => 1, "WGL_ARB_create_context_profile" => 1,
"WGL_ARB_extensions_string" => 1, "WGL_ARB_extensions_string" => 1,
"WGL_ARB_make_current_read" => 1, "WGL_ARB_make_current_read" => 1,

10
dlls/winex11.drv/opengl.c
View File

@ -163,6 +163,8 @@ typedef XID GLXPbuffer;
#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
#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
/** GLX_ARB_create_context_no_error */
#define GLX_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3
/** GLX_ARB_create_context_profile */ /** GLX_ARB_create_context_profile */
#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 #define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
/** GLX_ATI_pixel_format_float */ /** GLX_ATI_pixel_format_float */
@ -2118,6 +2120,12 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg
pContextAttribList += 2; pContextAttribList += 2;
ret->numAttribs++; ret->numAttribs++;
break; break;
case WGL_CONTEXT_OPENGL_NO_ERROR_ARB:
pContextAttribList[0] = GLX_CONTEXT_OPENGL_NO_ERROR_ARB;
pContextAttribList[1] = attribList[1];
pContextAttribList += 2;
ret->numAttribs++;
break;
case WGL_CONTEXT_PROFILE_MASK_ARB: case WGL_CONTEXT_PROFILE_MASK_ARB:
pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB;
pContextAttribList[1] = attribList[1]; pContextAttribList[1] = attribList[1];
@ -3179,6 +3187,8 @@ static void X11DRV_WineGL_LoadExtensions(void)
register_extension( "WGL_ARB_create_context" ); register_extension( "WGL_ARB_create_context" );
opengl_funcs.ext.p_wglCreateContextAttribsARB = X11DRV_wglCreateContextAttribsARB; opengl_funcs.ext.p_wglCreateContextAttribsARB = X11DRV_wglCreateContextAttribsARB;
if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_no_error" ))
register_extension( "WGL_ARB_create_context_no_error" );
if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_profile")) if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_profile"))
register_extension("WGL_ARB_create_context_profile"); register_extension("WGL_ARB_create_context_profile");
} }

1
include/wine/wgl.h
View File

@ -5016,6 +5016,7 @@ typedef unsigned int GLhandleARB;
#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
#define WGL_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3
#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 #define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
#define WGL_CUBE_MAP_FACE_ARB 0x207C #define WGL_CUBE_MAP_FACE_ARB 0x207C
#define WGL_DEPTH_BITS_ARB 0x2022 #define WGL_DEPTH_BITS_ARB 0x2022