From d30bfe1a41625d156d1b2065a36ec49c5d9e5996 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 3 Apr 2014 21:39:17 -0600 Subject: [PATCH] Add patch to silence repeated resource_check_usage FIXME. --- ...-repeated-resource_check_usage-FIXME.patch | 33 +++++++++++++++++++ .../acff3012-0f75-4710-9941-08b5ce4c61f3.def | 4 +++ patches/patch-list.patch | 3 +- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 patches/98-Miscellaneous/0002-wined3d-Silence-repeated-resource_check_usage-FIXME.patch create mode 100644 patches/98-Miscellaneous/acff3012-0f75-4710-9941-08b5ce4c61f3.def diff --git a/patches/98-Miscellaneous/0002-wined3d-Silence-repeated-resource_check_usage-FIXME.patch b/patches/98-Miscellaneous/0002-wined3d-Silence-repeated-resource_check_usage-FIXME.patch new file mode 100644 index 00000000..14967a8e --- /dev/null +++ b/patches/98-Miscellaneous/0002-wined3d-Silence-repeated-resource_check_usage-FIXME.patch @@ -0,0 +1,33 @@ +From 0c70b7b664bc3a1b997cd8ff72f08deae099a879 Mon Sep 17 00:00:00 2001 +From: "Erich E. Hoover" +Date: Thu, 3 Apr 2014 21:36:33 -0600 +Subject: wined3d: Silence repeated resource_check_usage FIXME. + +--- + dlls/wined3d/resource.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c +index 999dc5c..5a06346 100644 +--- a/dlls/wined3d/resource.c ++++ b/dlls/wined3d/resource.c +@@ -56,9 +56,14 @@ static void resource_check_usage(DWORD usage) + | WINED3DUSAGE_STATICDECL + | WINED3DUSAGE_OVERLAY + | WINED3DUSAGE_TEXTURE; ++ static DWORD notified = 0; ++ DWORD unhandled = usage & ~handled; + +- if (usage & ~handled) +- FIXME("Unhandled usage flags %#x.\n", usage & ~handled); ++ if (unhandled && (unhandled & ~notified)) ++ { ++ FIXME("Unhandled usage flags %#x.\n", unhandled); ++ notified |= unhandled; ++ } + } + + HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, +-- +1.7.9.5 + diff --git a/patches/98-Miscellaneous/acff3012-0f75-4710-9941-08b5ce4c61f3.def b/patches/98-Miscellaneous/acff3012-0f75-4710-9941-08b5ce4c61f3.def new file mode 100644 index 00000000..f819c2dc --- /dev/null +++ b/patches/98-Miscellaneous/acff3012-0f75-4710-9941-08b5ce4c61f3.def @@ -0,0 +1,4 @@ +Revision: 1 +Author: Erich E. Hoover +Title: wined3d: Silence repeated resource_check_usage FIXME. + diff --git a/patches/patch-list.patch b/patches/patch-list.patch index e4f6e7e7..7207cffc 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -37,7 +37,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,37 @@ const char *wine_get_version(void) +@@ -478,6 +478,38 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -61,6 +61,7 @@ index a273502..5fa0cd5 100644 + { "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." }, + { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." }, ++ { "acff3012-0f75-4710-9941-08b5ce4c61f3:1", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME." }, + { "eec5dea8-879d-417b-9f97-364deaae6576:1", "Sebastian Lackner", "Add tests for IVMRMonitorConfig." }, + { "e46b26df-3c1b-419c-9579-f0d1e1c50bea:1", "Sebastian Lackner", "Workaround for broken implementation of shlwapi url functions." }, + { NULL, NULL, NULL }