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

zink: delete zink_fb_clear_util_unpack_clear_color

Browse Source 
no longer used

Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17366>
This commit is contained in:
Mike Blumenkrantz
2022-07-06 10:35:03 -04:00
committed by Marge Bot
parent d8fa4e6797
commit b0e62adbcc
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -560,12 +560,6 @@ zink_fb_clear_first_needs_explicit(struct zink_framebuffer_clear *fb_clear)
return zink_fb_clear_element_needs_explicit(zink_fb_clear_element(fb_clear, 0)); return zink_fb_clear_element_needs_explicit(zink_fb_clear_element(fb_clear, 0));
} }
void
zink_fb_clear_util_unpack_clear_color(struct zink_framebuffer_clear_data *clear, enum pipe_format format, union pipe_color_union *color)
{
*color = clear->color.color;
}
static void static void
fb_clears_apply_internal(struct zink_context *ctx, struct pipe_resource *pres, int i) fb_clears_apply_internal(struct zink_context *ctx, struct pipe_resource *pres, int i)
{ {

3
src/gallium/drivers/zink/zink_clear.h
View File

@@ -129,6 +129,3 @@ zink_fb_clears_apply_or_discard(struct zink_context *ctx, struct pipe_resource *
void void
zink_fb_clears_apply_region(struct zink_context *ctx, struct pipe_resource *pres, struct u_rect region); zink_fb_clears_apply_region(struct zink_context *ctx, struct pipe_resource *pres, struct u_rect region);
void
zink_fb_clear_util_unpack_clear_color(struct zink_framebuffer_clear_data *clear, enum pipe_format format, union pipe_color_union *color);

2
src/gallium/drivers/zink/zink_context.c
View File

@@ -2240,7 +2240,7 @@ begin_rendering(struct zink_context *ctx)
continue; continue;
} }
/* we now know there's one clear that can be done here */ /* we now know there's one clear that can be done here */
zink_fb_clear_util_unpack_clear_color(clear, ctx->fb_state.cbufs[i]->format, (void*)&ctx->dynamic_fb.attachments[i].clearValue); memcpy(&ctx->dynamic_fb.attachments[i].clearValue, &clear->color.color, sizeof(float) * 4);
ctx->dynamic_fb.attachments[i].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; ctx->dynamic_fb.attachments[i].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
} }
if (ctx->fb_state.zsbuf && zink_fb_clear_enabled(ctx, PIPE_MAX_COLOR_BUFS)) { if (ctx->fb_state.zsbuf && zink_fb_clear_enabled(ctx, PIPE_MAX_COLOR_BUFS)) {

2
src/gallium/drivers/zink/zink_render_pass.c
View File

@@ -528,7 +528,7 @@ begin_render_pass(struct zink_context *ctx)
continue; continue;
} }
/* we now know there's one clear that can be done here */ /* we now know there's one clear that can be done here */
zink_fb_clear_util_unpack_clear_color(clear, fb_state->cbufs[i]->format, (void*)&clears[i].color); memcpy(&clears[i].color, &clear->color.color, sizeof(float) * 4);
rpbi.clearValueCount = i + 1; rpbi.clearValueCount = i + 1;
clear_validate |= PIPE_CLEAR_COLOR0 << i; clear_validate |= PIPE_CLEAR_COLOR0 << i;
assert(ctx->framebuffer->rp->state.clears); assert(ctx->framebuffer->rp->state.clears);