Mesa (staging/20.3): st/mesa: don't do glCopyPixels via blit if depth bounds test is enabled

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 99ff47e8538fc9268f00829a509cf4403368e38f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99ff47e8538fc9268f00829a509cf4403368e38f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Dec  8 20:40:57 2020 -0500

st/mesa: don't do glCopyPixels via blit if depth bounds test is enabled

Fixes: 36a6f848bb0 - st/mesa: add EXT_depth_bounds_test

Reviewed-by: Zoltán Böszörményi <zboszor at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7720>
(cherry picked from commit 8848114345833873aaa7855edbdb40505bc0b736)

---

 .pick_status.json                         | 2 +-
 src/mesa/state_tracker/st_cb_drawpixels.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 6fe3f2033c3..e34446c6a78 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -202,7 +202,7 @@
         "description": "st/mesa: don't do glCopyPixels via blit if depth bounds test is enabled",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "36a6f848bb03828aa9c4dc28774acf09055f2831"
     },
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index c16ea1dc60b..91804327a83 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1570,6 +1570,7 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
          !ctx->Color.BlendEnabled &&
          !ctx->Color.AlphaEnabled &&
          (!ctx->Color.ColorLogicOpEnabled || ctx->Color.LogicOp == GL_COPY) &&
+         !ctx->Depth.BoundsTest &&
          !ctx->Depth.Test &&
          !ctx->Fog.Enabled &&
          !ctx->Stencil.Enabled &&