Henri Verbeet : wined3d: Allow binding scratch textures.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 54d63891f3b1245b485b37d3a3b139301a7b01cb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=54d63891f3b1245b485b37d3a...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Sun Nov 18 22:27:15 2018 +0330

wined3d: Allow binding scratch textures.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d8/tests/device.c | 6 ++----
 dlls/d3d9/tests/device.c | 6 ++----
 dlls/wined3d/device.c    | 6 ------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 862dbb4..5669009 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -9055,8 +9055,7 @@ static void test_resource_access(void)
             if (SUCCEEDED(IDirect3DSurface8_GetContainer(surface, &IID_IDirect3DBaseTexture8, (void **)&texture)))
             {
                 hr = IDirect3DDevice8_SetTexture(device, 0, texture);
-                todo_wine_if(surface_desc.Pool == D3DPOOL_SCRATCH)
-                    ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
+                ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
                 hr = IDirect3DDevice8_SetTexture(device, 0, NULL);
                 ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
                 IDirect3DBaseTexture8_Release(texture);
@@ -9121,8 +9120,7 @@ static void test_resource_access(void)
         ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr);
 
         hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture);
-        todo_wine_if(volume_desc.Pool == D3DPOOL_SCRATCH)
-            ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
         hr = IDirect3DDevice8_SetTexture(device, 0, NULL);
         ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
 
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index ee7d0c6..4e620d5 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -12888,8 +12888,7 @@ static void test_resource_access(void)
             if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture)))
             {
                 hr = IDirect3DDevice9_SetTexture(device, 0, texture);
-                todo_wine_if(surface_desc.Pool == D3DPOOL_SCRATCH)
-                    ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
+                ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
                 hr = IDirect3DDevice9_SetTexture(device, 0, NULL);
                 ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
                 IDirect3DBaseTexture9_Release(texture);
@@ -12954,8 +12953,7 @@ static void test_resource_access(void)
         ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr);
 
         hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture);
-        todo_wine_if(volume_desc.Pool == D3DPOOL_SCRATCH)
-            ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
         hr = IDirect3DDevice9_SetTexture(device, 0, NULL);
         ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
 
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 50ce89a..2ae9235 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3467,12 +3467,6 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device,
         return WINED3D_OK;
     }
 
-    if (texture && texture->resource.usage & WINED3DUSAGE_SCRATCH)
-    {
-        WARN("Rejecting attempt to set scratch texture.\n");
-        return WINED3DERR_INVALIDCALL;
-    }
-
     if (device->recording)
         device->recording->changed.textures |= 1u << stage;