From 64774ec3e543bc4ecc476923e777c4fd261c2bee Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 12 Apr 2023 08:17:52 +1000 Subject: [PATCH] Rebase against 1546ef3015999ee27066b317773050a5641c2023. --- ...-warn-about-used-contexts-in-wglShar.patch | 53 ------------------- patches/winex11-wglShareLists/definition | 2 - staging/upstream-commit | 2 +- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch delete mode 100644 patches/winex11-wglShareLists/definition 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 deleted file mode 100644 index dbf61d04..00000000 --- a/patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c08e405870abe35e11eb3895a601da3e438bc84b 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: [PATCH] winex11.drv: Only warn about used contexts in wglShareLists. - ---- - 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 42c2626a2c2..bee429ef2ad 100644 ---- a/dlls/opengl32/tests/opengl.c -+++ b/dlls/opengl32/tests/opengl.c -@@ -564,7 +564,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 d7fc123bddd..eab44e76126 100644 ---- a/dlls/winex11.drv/opengl.c -+++ b/dlls/winex11.drv/opengl.c -@@ -1934,18 +1934,16 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de - * current or when it hasn't shared display lists before. - */ - -- if(dest->has_been_current) -- { -- ERR("Could not share display lists because the destination context has already been current\n"); -- return FALSE; -- } -- else if(dest->sharing) -+ if(dest->sharing) - { - ERR("Could not share display lists because the destination context has already shared lists\n"); - return FALSE; - } - else - { -+ if(dest->has_been_current) -+ ERR("Recreating OpenGL context to share display lists, although the context has been current!\n"); -+ - /* Re-create the GLX context and share display lists */ - pglXDestroyContext(gdi_display, dest->ctx); - dest->ctx = create_glxcontext(gdi_display, dest, org->ctx); --- -2.39.0 - diff --git a/patches/winex11-wglShareLists/definition b/patches/winex11-wglShareLists/definition deleted file mode 100644 index a74ef186..00000000 --- a/patches/winex11-wglShareLists/definition +++ /dev/null @@ -1,2 +0,0 @@ -Fixes: [11436] Do not fail when a used context is passed to wglShareLists -Fixes: [25419] Fix broken textures in XIII Century: Death or Glory diff --git a/staging/upstream-commit b/staging/upstream-commit index 318573b5..5fa291cc 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -9909631f23c037e90fe3ef1ccfeebfff2804d7ed +1546ef3015999ee27066b317773050a5641c2023