From: Qiang Yu <yuq825@gmail.com>
Date: Wed, 12 Feb 2020 03:07:03 +0000 (+0800)
Subject: lima: add missing resolve check for damage and reload
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b9003111bb59635ae407b251561f1d9937d434f0;p=mesa.git

lima: add missing resolve check for damage and reload

If color buffer is not touched, we do not need to reload or get
damage region from it.

Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3755>
---

diff --git a/src/gallium/drivers/lima/lima_draw.c b/src/gallium/drivers/lima/lima_draw.c
index 97e03bd5af3..c6c231f39e5 100644
--- a/src/gallium/drivers/lima/lima_draw.c
+++ b/src/gallium/drivers/lima/lima_draw.c
@@ -218,7 +218,7 @@ lima_ctx_dirty(struct lima_context *ctx)
 static inline struct lima_damage_region *
 lima_ctx_get_damage(struct lima_context *ctx)
 {
-   if (!ctx->framebuffer.base.nr_cbufs)
+   if (!(ctx->framebuffer.base.nr_cbufs && (ctx->resolve & PIPE_CLEAR_COLOR0)))
       return NULL;
 
    struct lima_surface *surf = lima_surface(ctx->framebuffer.base.cbufs[0]);
@@ -230,7 +230,7 @@ static bool
 lima_fb_need_reload(struct lima_context *ctx)
 {
    /* Depth buffer is always discarded */
-   if (!ctx->framebuffer.base.nr_cbufs)
+   if (!(ctx->framebuffer.base.nr_cbufs && (ctx->resolve & PIPE_CLEAR_COLOR0)))
       return false;
 
    struct lima_surface *surf = lima_surface(ctx->framebuffer.base.cbufs[0]);
@@ -1914,7 +1914,7 @@ _lima_flush(struct lima_context *ctx, bool end_of_frame)
 
    ctx->plb_index = (ctx->plb_index + 1) % lima_ctx_num_plb;
 
-   if (ctx->framebuffer.base.nr_cbufs) {
+   if (ctx->framebuffer.base.nr_cbufs && (ctx->resolve & PIPE_CLEAR_COLOR0)) {
       /* Set reload flag for next draw. It'll be unset if buffer is cleared */
       struct lima_surface *surf = lima_surface(ctx->framebuffer.base.cbufs[0]);
       surf->reload = true;