wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify patch to silence repeated resource_check_usage FIXMEs.

Browse Source
This commit is contained in:
Sebastian Lackner 2014-05-04 00:43:52 +02:00
parent aac5a0da53
commit af447c6cfd
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
patches/98-Miscellaneous/0002-wined3d-Silence-repeated-resource_check_usage-FIXME.patch
View File

@ -1,29 +1,32 @@
From 0c70b7b664bc3a1b997cd8ff72f08deae099a879 Mon Sep 17 00:00:00 2001
From 13d5795515836c4b8674bf96643333d68cd3d3a0 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
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(-)
dlls/wined3d/resource.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 999dc5c..5a06346 100644
index 999dc5c..3558440 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;
@@ -49,7 +49,7 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool)
- if (usage & ~handled)
- FIXME("Unhandled usage flags %#x.\n", usage & ~handled);
+ if (unhandled && (unhandled & ~notified))
static void resource_check_usage(DWORD usage)
{
- static const DWORD handled = WINED3DUSAGE_RENDERTARGET
+ static DWORD handled = WINED3DUSAGE_RENDERTARGET
| WINED3DUSAGE_DEPTHSTENCIL
| WINED3DUSAGE_DYNAMIC
| WINED3DUSAGE_AUTOGENMIPMAP
@@ -58,7 +58,10 @@ static void resource_check_usage(DWORD usage)
| WINED3DUSAGE_TEXTURE;
if (usage & ~handled)
+ {
+ FIXME("Unhandled usage flags %#x.\n", unhandled);
+ notified |= unhandled;
FIXME("Unhandled usage flags %#x.\n", usage & ~handled);
+ handled |= usage;
+ }
}

2
patches/98-Miscellaneous/acff3012-0f75-4710-9941-08b5ce4c61f3.def
View File

@ -1,4 +1,4 @@
Revision: 1
Revision: 2
Author: Erich E. Hoover
Title: wined3d: Silence repeated resource_check_usage FIXME.

2
patches/patch-list.patch
View File

@ -60,7 +60,7 @@ index a273502..5fa0cd5 100644
+ { "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." },
+ { "325645ba-d39d-4de4-9c94-3fe694eedaab:1", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." },
+ { "acff3012-0f75-4710-9941-08b5ce4c61f3:1", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME." },
+ { "acff3012-0f75-4710-9941-08b5ce4c61f3:2", "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 }