Stefan Dösinger : wined3d: Remove WINED3D_RESOURCE_ACCESS_SCRATCH.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bcb651ca802f0c64949abb0d662f0bee5165cb2e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bcb651ca802f0c64949abb0d66...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Thu Aug 22 14:57:58 2013 +0200

wined3d: Remove WINED3D_RESOURCE_ACCESS_SCRATCH.

---

 dlls/wined3d/resource.c        |    4 +---
 dlls/wined3d/wined3d_private.h |    3 ---
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index eb1dcd0..59fced9 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -53,12 +53,10 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool)
         case WINED3D_POOL_MANAGED:
             return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU;
 
+        case WINED3D_POOL_SCRATCH:
         case WINED3D_POOL_SYSTEM_MEM:
             return WINED3D_RESOURCE_ACCESS_CPU;
 
-        case WINED3D_POOL_SCRATCH:
-            return WINED3D_RESOURCE_ACCESS_SCRATCH;
-
         default:
             FIXME("Unhandled pool %#x.\n", pool);
             return 0;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e19a61e..c9be67e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1917,9 +1917,6 @@ static inline void invalidate_active_texture(const struct wined3d_device *device
 
 #define WINED3D_RESOURCE_ACCESS_GPU     0x1
 #define WINED3D_RESOURCE_ACCESS_CPU     0x2
-/* SCRATCH is mostly the same as CPU, but can't be used by the GPU at all,
- * not even for resource uploads. */
-#define WINED3D_RESOURCE_ACCESS_SCRATCH 0x4
 
 struct wined3d_resource_ops
 {