From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 3 Mar 2017 07:03:03 +0000 (-0800)
Subject: anv/blorp: Only set a clear color for resolves if fast-cleared
X-Git-Tag: upstream/17.1.0~1435
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=678fd00f2f5b213d0317ba51a8163c4c5bd1f3dc;p=platform%2Fupstream%2Fmesa.git

anv/blorp: Only set a clear color for resolves if fast-cleared

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Cc: "17.0" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index 2bab0d0..9b9995c 100644
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -1508,7 +1508,8 @@ ccs_resolve_attachment(struct anv_cmd_buffer *cmd_buffer,
    struct blorp_surf surf;
    get_blorp_surf_for_anv_image(image, VK_IMAGE_ASPECT_COLOR_BIT,
                                 att_state->aux_usage, &surf);
-   surf.clear_color = vk_to_isl_color(att_state->clear_value.color);
+   if (att_state->fast_clear)
+      surf.clear_color = vk_to_isl_color(att_state->clear_value.color);
 
    /* From the Sky Lake PRM Vol. 7, "Render Target Resolve":
     *