wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location().

The sub-resource index should not be offset by the layer index, which represents a depth offset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53027Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location().
7c529506 · Zebediah Figura · Alexandre Julliard · 74832c21 · 7c529506
Commit 7c529506 authored May 23, 2022 by Zebediah Figura Committed by Alexandre Julliard May 24, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 6 deletions

view.c dlls/wined3d/view.c +15 -6

No files found.
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -315,7 +315,7 @@ static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_cont
 static void wined3d_view_invalidate_location(struct wined3d_resource *resource,
        const struct wined3d_view_desc *desc, DWORD location)
 {
-    unsigned int i, sub_resource_idx, layer_count;
+    unsigned int i, sub_resource_idx;
    struct wined3d_texture *texture;

    if (resource->type == WINED3D_RTYPE_BUFFER)
@@ -325,17 +325,21 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource,
    }

    texture = texture_from_resource(resource);
+    if (resource->type == WINED3D_RTYPE_TEXTURE_3D)
+    {
+        wined3d_texture_invalidate_location(texture, desc->u.texture.level_idx, location);
+        return;
+    }

    sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx;
-    layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1;
-    for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count)
+    for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count)
        wined3d_texture_invalidate_location(texture, sub_resource_idx, location);
 }

 static void wined3d_view_load_location(struct wined3d_resource *resource,
        const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location)
 {
-    unsigned int i, sub_resource_idx, layer_count;
+    unsigned int i, sub_resource_idx;
    struct wined3d_texture *texture;

    if (resource->type == WINED3D_RTYPE_BUFFER)
@@ -345,9 +349,14 @@ static void wined3d_view_load_location(struct wined3d_resource *resource,
    }

    texture = texture_from_resource(resource);
+    if (resource->type == WINED3D_RTYPE_TEXTURE_3D)
+    {
+        wined3d_texture_load_location(texture, desc->u.texture.level_idx, context, location);
+        return;
+    }
+
    sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx;
-    layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1;
-    for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count)
+    for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count)
        wined3d_texture_load_location(texture, sub_resource_idx, context, location);
 }