[resend 3/4] d3d9: Call wined3d_device_copy_sub_resource_region() instead of wined3d_device_update_surface() in d3d9_device_UpdateSurface().

Riccardo Bortolato rikyz619 at gmail.com
Mon Dec 21 11:38:05 CST 2015


Enabled a previously failing test in d3d9/tests.
Modified resource type check in wined3d_device_copy_sub_resource_region() to allow operations with both textures and cubetextures.
Signed-off-by: Riccardo Bortolato <rikyz619 at gmail.com>
---
 dlls/d3d9/device.c       | 20 ++++++++++++++++++--
 dlls/d3d9/tests/device.c |  2 +-
 dlls/wined3d/device.c    | 18 +++++++++++++-----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 16b27e5..3dca920 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1227,16 +1227,32 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface,
     struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
     struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface);
     struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface);
+    struct wined3d_box src_box;
     HRESULT hr;
 
     TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n",
             iface, src_surface, src_rect, dst_surface, dst_point);
 
+    if (src_rect)
+    {
+        src_box.left = src_rect->left;
+        src_box.top = src_rect->top;
+        src_box.right = src_rect->right;
+        src_box.bottom = src_rect->bottom;
+        src_box.front = 0;
+        src_box.back = 1;
+    }
+
     wined3d_mutex_lock();
-    hr = wined3d_device_update_surface(device->wined3d_device, src->wined3d_surface, src_rect,
-            dst->wined3d_surface, dst_point);
+    hr = wined3d_device_copy_sub_resource_region(device->wined3d_device,
+            wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0,
+            dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture),
+            src->sub_resource_idx, src_rect ? &src_box : NULL);
     wined3d_mutex_unlock();
 
+    if (FAILED(hr))
+        return D3DERR_INVALIDCALL;
+
     return hr;
 }
 
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 6cdb225..3987d74 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -9882,7 +9882,7 @@ static void test_mipmap_lock(void)
     hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, surface_dst, NULL);
     ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr);
     hr = IDirect3DDevice9_UpdateSurface(device, surface2, NULL, surface_dst2, NULL);
-    todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
 
     /* Apparently there's no validation on the container. */
     hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture,
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 32ab0f1..50fc6f5 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3904,6 +3904,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
 {
     struct wined3d_texture *dst_texture, *src_texture;
     struct wined3d_resource *tmp;
+    enum wined3d_resource_type src_resource_type, dst_resource_type;
     RECT dst_rect, src_rect;
     HRESULT hr;
 
@@ -3918,11 +3919,18 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
         return WINED3DERR_INVALIDCALL;
     }
 
-    if (src_resource->type != dst_resource->type)
+    src_resource_type = src_resource->type;
+    if (src_resource_type == WINED3D_RTYPE_CUBE_TEXTURE)
+       src_resource_type = WINED3D_RTYPE_TEXTURE;
+    dst_resource_type = dst_resource->type;
+    if (dst_resource_type == WINED3D_RTYPE_CUBE_TEXTURE)
+       dst_resource_type = WINED3D_RTYPE_TEXTURE;
+
+    if (src_resource_type != dst_resource_type)
     {
         WARN("Resource types (%s / %s) don't match.\n",
-                debug_d3dresourcetype(dst_resource->type),
-                debug_d3dresourcetype(src_resource->type));
+                debug_d3dresourcetype(dst_resource_type),
+                debug_d3dresourcetype(src_resource_type));
         return WINED3DERR_INVALIDCALL;
     }
 
@@ -3934,9 +3942,9 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
         return WINED3DERR_INVALIDCALL;
     }
 
-    if (dst_resource->type != WINED3D_RTYPE_TEXTURE)
+    if (dst_resource_type != WINED3D_RTYPE_TEXTURE)
     {
-        FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type));
+        FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource_type));
         return WINED3DERR_INVALIDCALL;
     }
 
-- 
1.9.1




More information about the wine-patches mailing list