=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Remove SCRATCH and SYSMEM lockability warnings.

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Thu Oct 24 14:43:41 2013 +0200

wined3d: Remove SCRATCH and SYSMEM lockability warnings.

They are not needed any more, resource_access_from_pool takes care of
this.

---

 dlls/wined3d/surface.c |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index daa26e2..a4cbd81 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6795,20 +6795,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN
      * Levels need to be checked too, since they all affect what can be done. */
     switch (pool)
     {
-        case WINED3D_POOL_SCRATCH:
-            if (!lockable)
-            {
-                FIXME("Called with a pool of SCRATCH and a lockable of FALSE "
-                        "which are mutually exclusive, setting lockable to TRUE.\n");
-                lockable = TRUE;
-            }
-            break;
-
-        case WINED3D_POOL_SYSTEM_MEM:
-            if (!lockable)
-                FIXME("Called with a pool of SYSTEMMEM and a lockable of FALSE, this is acceptable but unexpected.\n");
-            break;
-
         case WINED3D_POOL_MANAGED:
             if (usage & WINED3DUSAGE_DYNAMIC)
                 FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n");
@@ -6819,6 +6805,10 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN
                 WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n");
             break;
 
+        case WINED3D_POOL_SCRATCH:
+        case WINED3D_POOL_SYSTEM_MEM:
+            break;
+
         default:
             FIXME("Unknown pool %#x.\n", pool);
             break;