wined3d: Get rid of the special case for WINED3D_RTYPE_TEXTURE_3D in…

wined3d: Get rid of the special case for WINED3D_RTYPE_TEXTURE_3D in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Get rid of the special case for WINED3D_RTYPE_TEXTURE_3D in…
92403165 · Henri Verbeet · Alexandre Julliard · 57268241 · 92403165
Commit 92403165 authored Mar 26, 2018 by Henri Verbeet Committed by Alexandre Julliard Mar 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

device.c dlls/wined3d/device.c +2 -5

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3820,12 +3820,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device,
    level_count = min(src_level_count, dst_level_count);

    src_size = max(src_texture->resource.width, src_texture->resource.height);
+    src_size = max(src_size, src_texture->resource.depth);
    dst_size = max(dst_texture->resource.width, dst_texture->resource.height);
-    if (type == WINED3D_RTYPE_TEXTURE_3D)
-    {
-        src_size = max(src_size, src_texture->resource.depth);
-        dst_size = max(dst_size, dst_texture->resource.depth);
-    }
+    dst_size = max(dst_size, dst_texture->resource.depth);
    while (src_size > dst_size)
    {
        src_size >>= 1;