From 80455f2b22932e51324ccb359f1da3852c168c4d Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 8 Jul 2014 01:03:49 +0200 Subject: [PATCH] Rebase patch to silence resource_check_usage FIXME. --- ...lence-repeated-resource_check_usage-FIXME.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/98-Miscellaneous/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch b/patches/98-Miscellaneous/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch index 94137074..e5266370 100644 --- a/patches/98-Miscellaneous/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch +++ b/patches/98-Miscellaneous/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch @@ -1,4 +1,4 @@ -From 13d5795515836c4b8674bf96643333d68cd3d3a0 Mon Sep 17 00:00:00 2001 +From b1b13aac629c00d03d68dcca64cb81e976e20580 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. @@ -8,19 +8,19 @@ Subject: wined3d: Silence repeated resource_check_usage FIXME. 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c -index 999dc5c..3558440 100644 +index 3a54dd8..d164681 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c -@@ -49,7 +49,7 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) +@@ -50,7 +50,7 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) static void resource_check_usage(DWORD usage) { - static const DWORD handled = WINED3DUSAGE_RENDERTARGET + static DWORD handled = WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL + | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC - | WINED3DUSAGE_AUTOGENMIPMAP -@@ -58,7 +58,10 @@ static void resource_check_usage(DWORD usage) +@@ -60,7 +60,10 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_TEXTURE; if (usage & ~handled) @@ -28,9 +28,9 @@ index 999dc5c..3558440 100644 FIXME("Unhandled usage flags %#x.\n", usage & ~handled); + handled |= usage; + } + if ((usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY)) == WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("WINED3DUSAGE_DYNAMIC used without WINED3DUSAGE_WRITEONLY.\n"); } - - HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, -- 1.7.9.5