From 01be545e92de87bd625d7c4f03c55077c56d208f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 27 May 2014 03:03:03 +0200 Subject: [PATCH] Replace strict draw ordering patch with a different approach. --- ...et-strictDrawOrdering-via-environmen.patch | 34 ---------------- ...anging-strict-drawing-through-an-exp.patch | 40 +++++++++++++++++++ .../19835498-8d90-4673-867e-2376af4d7c76.def | 4 -- .../2394843e-2bc4-4fa4-8368-1ef32093b89e.def | 3 ++ patches/patch-list.patch | 2 +- 5 files changed, 44 insertions(+), 39 deletions(-) delete mode 100644 patches/97-Pipelight/0003-wined3d-Allow-to-set-strictDrawOrdering-via-environmen.patch create mode 100644 patches/97-Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch delete mode 100644 patches/97-Pipelight/19835498-8d90-4673-867e-2376af4d7c76.def create mode 100644 patches/97-Pipelight/2394843e-2bc4-4fa4-8368-1ef32093b89e.def diff --git a/patches/97-Pipelight/0003-wined3d-Allow-to-set-strictDrawOrdering-via-environmen.patch b/patches/97-Pipelight/0003-wined3d-Allow-to-set-strictDrawOrdering-via-environmen.patch deleted file mode 100644 index 69de27bb..00000000 --- a/patches/97-Pipelight/0003-wined3d-Allow-to-set-strictDrawOrdering-via-environmen.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 34551d5eb1b88021766cafcb9046d1e76a2b3bf8 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Mon, 13 Jan 2014 23:37:02 +0100 -Subject: wined3d: Allow to set strictDrawOrdering via environment variable - ---- - dlls/wined3d/wined3d_main.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c -index a0ecfa7..fa89700 100644 ---- a/dlls/wined3d/wined3d_main.c -+++ b/dlls/wined3d/wined3d_main.c -@@ -140,6 +140,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) - HKEY appkey = 0; - DWORD len, tmpvalue; - WNDCLASSA wc; -+ const char *env; - - wined3d_context_tls_idx = TlsAlloc(); - if (wined3d_context_tls_idx == TLS_OUT_OF_INDEXES) -@@ -309,6 +310,9 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) - if (appkey) RegCloseKey( appkey ); - if (hkey) RegCloseKey( hkey ); - -+ if ((env = getenv("WINE_STRICT_DRAW_ORDERING"))) -+ wined3d_settings.strict_draw_ordering = atoi(env); -+ - return TRUE; - } - --- -1.7.9.5 - diff --git a/patches/97-Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch b/patches/97-Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch new file mode 100644 index 00000000..7c2f4e2d --- /dev/null +++ b/patches/97-Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch @@ -0,0 +1,40 @@ +From 46663b2c660db111ba9a208929cec841caa9308a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Tue, 27 May 2014 02:53:05 +0200 +Subject: wined3d: allow changing strict drawing through an exported function + +--- + dlls/wined3d/wined3d.spec | 2 ++ + dlls/wined3d/wined3d_main.c | 5 +++++ + 2 files changed, 7 insertions(+) + +diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec +index f1a45dd..7ee0914 100644 +--- a/dlls/wined3d/wined3d.spec ++++ b/dlls/wined3d/wined3d.spec +@@ -277,3 +277,5 @@ + @ cdecl wined3d_volume_preload(ptr) + @ cdecl wined3d_volume_set_priority(ptr long) + @ cdecl wined3d_volume_unmap(ptr) ++ ++@ cdecl wined3d_strictdrawing_set(long) +\ No newline at end of file +diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c +index e2a7f3f..c160ae0 100644 +--- a/dlls/wined3d/wined3d_main.c ++++ b/dlls/wined3d/wined3d_main.c +@@ -509,6 +509,11 @@ void wined3d_unregister_window(HWND window) + wined3d_wndproc_mutex_unlock(); + } + ++void wined3d_strictdrawing_set(int value) ++{ ++ wined3d_settings.strict_draw_ordering = value; ++} ++ + /* At process attach */ + BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) + { +-- +1.8.3.2 + diff --git a/patches/97-Pipelight/19835498-8d90-4673-867e-2376af4d7c76.def b/patches/97-Pipelight/19835498-8d90-4673-867e-2376af4d7c76.def deleted file mode 100644 index d2b2fa89..00000000 --- a/patches/97-Pipelight/19835498-8d90-4673-867e-2376af4d7c76.def +++ /dev/null @@ -1,4 +0,0 @@ -Revision: 1 -Author: Sebastian Lackner -Title: Allow to set wined3d strictDrawOrdering via environment variable. - diff --git a/patches/97-Pipelight/2394843e-2bc4-4fa4-8368-1ef32093b89e.def b/patches/97-Pipelight/2394843e-2bc4-4fa4-8368-1ef32093b89e.def new file mode 100644 index 00000000..5d72cf9e --- /dev/null +++ b/patches/97-Pipelight/2394843e-2bc4-4fa4-8368-1ef32093b89e.def @@ -0,0 +1,3 @@ +Revision: 1 +Author: Michael Müller +Title: Allow changing strict draw ordering through an exported function. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index 0589ce31..8c192f30 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -57,7 +57,7 @@ index a273502..5fa0cd5 100644 + { "5fb1f5c8-7f17-11e3-9b62-0090f5c75ad5:1", "Erich E. Hoover", "Implement TransmitFile." }, + { "3d7c4774-9e7f-11e3-9cfc-0090f5c75ad5:1", "Erich E. Hoover", "Implement missing fonts expected by Silverlight." }, + { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:2", "Michael Müller", "Decrease minimum SetTimer interval to 5 ms." }, -+ { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." }, ++ { "2394843e-2bc4-4fa4-8368-1ef32093b89e:1", "Michael Müller", "Allow changing strict draw ordering through an exported function." }, + { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." }, + { "325645ba-d39d-4de4-9c94-3fe694eedaab:1", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." }, + { "acff3012-0f75-4710-9941-08b5ce4c61f3:2", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME." },