From 1c6aeef3b422cbcc9e19269bfa8f2fd9c881dda2 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 13 Jan 2014 23:40:07 +0100 Subject: [PATCH] Added patch to add support for WINE_STRICT_DRAW_ORDERING environment variable --- ...et-strictDrawOrdering-via-environmen.patch | 34 +++++++++++++++++++ .../19835498-8d90-4673-867e-2376af4d7c76.def | 4 +++ patches/patch-list.patch | 3 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 patches/98-Miscellaneous/0003-wined3d-Allow-to-set-strictDrawOrdering-via-environmen.patch create mode 100644 patches/98-Miscellaneous/19835498-8d90-4673-867e-2376af4d7c76.def diff --git a/patches/98-Miscellaneous/0003-wined3d-Allow-to-set-strictDrawOrdering-via-environmen.patch b/patches/98-Miscellaneous/0003-wined3d-Allow-to-set-strictDrawOrdering-via-environmen.patch new file mode 100644 index 00000000..69de27bb --- /dev/null +++ b/patches/98-Miscellaneous/0003-wined3d-Allow-to-set-strictDrawOrdering-via-environmen.patch @@ -0,0 +1,34 @@ +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/98-Miscellaneous/19835498-8d90-4673-867e-2376af4d7c76.def b/patches/98-Miscellaneous/19835498-8d90-4673-867e-2376af4d7c76.def new file mode 100644 index 00000000..d2b2fa89 --- /dev/null +++ b/patches/98-Miscellaneous/19835498-8d90-4673-867e-2376af4d7c76.def @@ -0,0 +1,4 @@ +Revision: 1 +Author: Sebastian Lackner +Title: Allow to set wined3d strictDrawOrdering via environment variable. + diff --git a/patches/patch-list.patch b/patches/patch-list.patch index 0f98d7b5..87256251 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -33,7 +33,7 @@ diff --git a/libs/wine/config.c b/libs/wine/config.c index a273502..5fa0cd5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c -@@ -478,6 +478,30 @@ const char *wine_get_version(void) +@@ -478,6 +478,31 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -51,6 +51,7 @@ index a273502..5fa0cd5 100644 + { "cbe240e8-2c58-430a-b61c-7fbb9d0e1e11:1", "Sebastian Lackner", "Change return value of stub SetNamedPipeHandleState to TRUE." }, + { "00273da7-72f8-4025-9e96-0c2bc95dacdb:2", "Maarten Lankhorst", "Winepulse patches extracted from https://launchpad.net/~mlankhorst/+archive/ppa/+files/wine1.7_1.7.10-0ubuntu1~saucy1.debian.tar.gz." }, + { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:1", "Michael Müller", "Decrease minimum SetTimer interval from 15 to 5 ms." }, ++ { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." }, + { "eec5dea8-879d-417b-9f97-364deaae6576:1", "Sebastian Lackner", "Add tests for IVMRMonitorConfig." }, + { NULL, NULL, NULL } +};