OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: apply only the pending zs clear bits during deferred clears

Browse Source 
both bits will have been flagged at this point in order to indicate
that the aspects will be cleared "at some point" during the loop, but
when actually iterating through the pending clears, only the bits set
in the clear call should be applied

Fixes: 5c629e9ff2 ("zink: defer pipe_context::clear calls when not currently in a renderpass")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9366>
This commit is contained in:
Mike Blumenkrantz
2021-03-02 09:22:18 -05:00
committed by Marge Bot
parent e891f039da
commit 1294aec650
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/zink/zink_clear.c
View File

@@ -310,9 +310,13 @@ out:
for (int j = !zink_fb_clear_first_needs_explicit(color_clear); j < num_clears; j++) {
struct zink_framebuffer_clear_data *clear = zink_fb_clear_element(color_clear, j);
struct zink_framebuffer_clear_data *zsclear = NULL;
if (zs_clear)
/* zs bits are both set here if those aspects should be cleared at some point */
unsigned clear_bits = to_clear & ~PIPE_CLEAR_DEPTHSTENCIL;
if (zs_clear) {
zsclear = zink_fb_clear_element(zs_clear, j);
zink_clear(&ctx->base, to_clear,
clear_bits |= zsclear->zs.bits;
}
zink_clear(&ctx->base, clear_bits,
clear->has_scissor ? &clear->scissor : NULL,
&clear->color.color,
zsclear ? zsclear->zs.depth : 0,
@@ -321,7 +325,7 @@ out:
} else {
for (int j = !zink_fb_clear_first_needs_explicit(zs_clear); j < zink_fb_clear_count(zs_clear); j++) {
struct zink_framebuffer_clear_data *clear = zink_fb_clear_element(zs_clear, j);
zink_clear(&ctx->base, to_clear,
zink_clear(&ctx->base, clear->zs.bits,
clear->has_scissor ? &clear->scissor : NULL,
NULL,
clear->zs.depth,