[PATCH] wined3d: Do not iterate over multiple layers when clearing 3D UAVs.

[Zebediah Figura]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52390
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
I'd argue this demonstrates overloading the layer_count parameter as depth is
error-prone, and we should probably avoid it...

 dlls/wined3d/view.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index d6f58309b32..efa98ea13eb 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -1504,11 +1504,20 @@ void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view
 
         format_gl = wined3d_format_gl(resource->format);
         texture_gl = wined3d_texture_gl(texture_from_resource(resource));
-        layer_count = view_gl->v.desc.u.texture.layer_count;
         level_count = view_gl->v.desc.u.texture.level_count;
-        base_layer = view_gl->v.desc.u.texture.layer_idx;
         base_level = view_gl->v.desc.u.texture.level_idx;
 
+        if (resource->type == WINED3D_RTYPE_TEXTURE_3D)
+        {
+            layer_count = 1;
+            base_layer = 0;
+        }
+        else
+        {
+            layer_count = view_gl->v.desc.u.texture.layer_count;
+            base_layer = view_gl->v.desc.u.texture.layer_idx;
+        }
+
         if (format_gl->f.byte_count <= 4 && !fp)
         {
             gl_format = format_gl->format;
-- 
2.34.1

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

[Henri Verbeet]

On Thu, 13 Jan 2022 at 01:41, Zebediah Figura <zfigura(a)codeweavers.com> wrote:
> ---
> I'd argue this demonstrates overloading the layer_count parameter as depth is
> error-prone, and we should probably avoid it...

I'm inclined to agree. I've run into this kind of thing before,
although usually I caught it before submitting the patch upstream...