[PATCH 3/6] d3d9: Allow GPU access to D3DPOOL_SYSTEMMEM resources.

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
 dlls/d3d9/d3d9_private.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index fc6e4af6501..be5f28a5278 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -304,11 +304,11 @@ static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned i
         case WINED3D_RESOURCE_ACCESS_GPU:
             return D3DPOOL_DEFAULT;
         case WINED3D_RESOURCE_ACCESS_CPU:
-            if (usage & WINED3DUSAGE_SCRATCH)
-                return D3DPOOL_SCRATCH;
-            return D3DPOOL_SYSTEMMEM;
+            return D3DPOOL_SCRATCH;
         case WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU:
-            return D3DPOOL_MANAGED;
+            if (usage & WINED3DUSAGE_MANAGED)
+                return D3DPOOL_MANAGED;
+            return D3DPOOL_SYSTEMMEM;
     }
 }
 
@@ -321,9 +321,9 @@ static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int
                 return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
             return WINED3D_RESOURCE_ACCESS_GPU;
         case D3DPOOL_MANAGED:
+        case D3DPOOL_SYSTEMMEM:
             return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU
                     | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
-        case D3DPOOL_SYSTEMMEM:
         case D3DPOOL_SCRATCH:
             return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
         default:
-- 
2.18.1