From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 17 Jun 2019 21:35:31 +0000 (-0500)
Subject: iris: Make resource_copy_region handle packed depth-stencil resources.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=659d4f613ef4479d9e0a280f80ebb05ed07daa38;p=mesa.git

iris: Make resource_copy_region handle packed depth-stencil resources.

Also copy along the separate stencil buffer if needed.

Fixes Piglit's arb_copy_image-formats.
---

diff --git a/src/gallium/drivers/iris/iris_blit.c b/src/gallium/drivers/iris/iris_blit.c
index 95209cb408f..6f57dc8ab4c 100644
--- a/src/gallium/drivers/iris/iris_blit.c
+++ b/src/gallium/drivers/iris/iris_blit.c
@@ -626,6 +626,16 @@ iris_resource_copy_region(struct pipe_context *ctx,
 
    iris_copy_region(&ice->blorp, batch, dst, dst_level, dstx, dsty, dstz,
                     src, src_level, src_box);
+
+   if (util_format_is_depth_and_stencil(dst->format) &&
+       util_format_has_stencil(util_format_description(src->format))) {
+      struct iris_resource *junk, *s_src_res, *s_dst_res;
+      iris_get_depth_stencil_resources(src, &junk, &s_src_res);
+      iris_get_depth_stencil_resources(dst, &junk, &s_dst_res);
+
+      iris_copy_region(&ice->blorp, batch, &s_dst_res->base, dst_level, dstx,
+                       dsty, dstz, &s_src_res->base, src_level, src_box);
+   }
 }
 
 void