From f00e0bfd8a9562a31c51710bc5211bd7d9a059ad Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Thu, 9 Jun 2022 13:39:37 -0400
Subject: [PATCH] panvk: Simplify depth clear preload condition

Easier to understand and equivalent in practice.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16950>
---
 src/panfrost/vulkan/panvk_vX_meta_clear.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c
index c84795d25a7..cc2874823e9 100644
--- a/src/panfrost/vulkan/panvk_vX_meta_clear.c
+++ b/src/panfrost/vulkan/panvk_vX_meta_clear.c
@@ -428,8 +428,8 @@ panvk_meta_clear_zs_img(struct panvk_cmd_buffer *cmdbuf,
    if (util_format_has_depth(fdesc)) {
       fbinfo->zs.view.zs = &view;
       if (util_format_has_stencil(fdesc)) {
-         fbinfo->zs.preload.z = !fbinfo->zs.clear.z && fbinfo->zs.clear.s;
-         fbinfo->zs.preload.s = !fbinfo->zs.clear.s && fbinfo->zs.clear.z;
+         fbinfo->zs.preload.z = !fbinfo->zs.clear.z;
+         fbinfo->zs.preload.s = !fbinfo->zs.clear.s;
       }
    } else {
       fbinfo->zs.view.s = &view;