[PATCH 5/5] wined3d: Use wined3d_texture_get_level_box() in wined3d_device_update_texture().

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
 dlls/wined3d/device.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5272e2ef236..5a94d03b9bb 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3821,7 +3821,6 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device,
     unsigned int src_size, dst_size, src_skip_levels = 0;
     unsigned int src_level_count, dst_level_count;
     unsigned int layer_count, level_count, i, j;
-    unsigned int width, height, depth;
     enum wined3d_resource_type type;
     struct wined3d_box box;
 
@@ -3892,11 +3891,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device,
     /* Update every surface level of the texture. */
     for (i = 0; i < level_count; ++i)
     {
-        width = wined3d_texture_get_level_width(dst_texture, i);
-        height = wined3d_texture_get_level_height(dst_texture, i);
-        depth = wined3d_texture_get_level_depth(dst_texture, i);
-        wined3d_box_set(&box, 0, 0, width, height, 0, depth);
-
+        wined3d_texture_get_level_box(dst_texture, i, &box);
         for (j = 0; j < layer_count; ++j)
         {
             wined3d_cs_emit_blt_sub_resource(device->cs,
-- 
2.11.0

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=52403

Your paranoid android.


=== debian9 (build log) ===

error: patch failed: dlls/wined3d/context.c:784
error: patch failed: dlls/wined3d/context.c:757
Task: Patch failed to apply

=== debian9 (build log) ===

error: patch failed: dlls/wined3d/context.c:784
error: patch failed: dlls/wined3d/context.c:757
Task: Patch failed to apply