wined3d: Fix downloading data for 1D array textures.

glGetTexImage() downloads data for all layers. Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Fix downloading data for 1D array textures.
a586d4e8 · Józef Kucia · Alexandre Julliard · 4bca8dbe · a586d4e8
Commit a586d4e8 authored Nov 16, 2018 by Józef Kucia Committed by Alexandre Julliard Nov 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

texture.c dlls/wined3d/texture.c +6 -6

No files found.
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2159,7 +2159,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s
    }
 }
-static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
+static void texture_download_data_slow_path(struct wined3d_texture *texture, unsigned int sub_resource_idx,
        struct wined3d_context *context, const struct wined3d_bo_address *data)
 {
    const struct wined3d_gl_info *gl_info = context->gl_info;
@@ -2186,7 +2186,7 @@ static void texture2d_download_data(struct wined3d_texture *texture, unsigned in
    target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx);
    level = sub_resource_idx % texture->level_count;
-    if (target == GL_TEXTURE_2D_ARRAY)
+    if (target == GL_TEXTURE_1D_ARRAY || target == GL_TEXTURE_2D_ARRAY)
    {
        if (format_gl->f.download)
        {
@@ -2401,12 +2401,12 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int
    target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx);
    level = sub_resource_idx % texture->level_count;
-    if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D
+    if ((texture->resource.type == WINED3D_RTYPE_TEXTURE_2D
-        && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count
+            && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count
            || texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_COND_NP2_EMULATED)))
+            || target == GL_TEXTURE_1D_ARRAY)
    {
-        /* 2D-specific special cases. */
+        texture_download_data_slow_path(texture, sub_resource_idx, context, data);
-        texture2d_download_data(texture, sub_resource_idx, context, data);
        return;
    }