diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f4990022..f883dfe5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -7415,7 +7415,7 @@ fi # | * [#25419] Fix broken textures in XIII Century: Death or Glory # | # | Modified files: -# | * dlls/winex11.drv/opengl.c +# | * dlls/opengl32/tests/opengl.c, dlls/winex11.drv/opengl.c # | if test "$enable_winex11_wglShareLists" -eq 1; then patch_apply winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch diff --git a/patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch b/patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch index f5ab8dab..f03d96ea 100644 --- a/patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch +++ b/patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch @@ -1,17 +1,31 @@ -From 7424e54afd0424b8b436c78b8c30f2480980a5b0 Mon Sep 17 00:00:00 2001 +From 4d2c03539d7316d75b56fd8a2c852a9013234f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 28 Sep 2014 21:20:52 +0200 Subject: winex11.drv: Only warn about used contexts in wglShareLists. --- - dlls/winex11.drv/opengl.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) + dlls/opengl32/tests/opengl.c | 2 +- + dlls/winex11.drv/opengl.c | 10 ++++------ + 2 files changed, 5 insertions(+), 7 deletions(-) +diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c +index e5e1507..5454d3a 100644 +--- a/dlls/opengl32/tests/opengl.c ++++ b/dlls/opengl32/tests/opengl.c +@@ -365,7 +365,7 @@ static void test_sharelists(HDC winhdc) + res = wglMakeCurrent(winhdc, hglrc2); + ok(res, "Make current failed\n"); + res = wglShareLists(hglrc1, hglrc2); +- todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); ++ ok(res, "Sharing display lists with a destination context which has been made current failed\n"); + wglMakeCurrent(0, 0); + wglDeleteContext(hglrc2); + } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c -index 3d0bd24..2589fd7 100644 +index 0f7534e..39929f2 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c -@@ -1927,18 +1927,16 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de +@@ -1959,18 +1959,16 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de * current or when it hasn't shared display lists before. */ @@ -35,5 +49,5 @@ index 3d0bd24..2589fd7 100644 pglXDestroyContext(gdi_display, dest->ctx); dest->ctx = create_glxcontext(gdi_display, dest, org->ctx); -- -2.6.2 +2.8.0