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

zink: make batch_rp and norp static inlines

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11965>
This commit is contained in:
Mike Blumenkrantz
2021-05-11 19:42:20 -04:00
committed by Marge Bot
parent 2795537d5c
commit 10e7cb5888
2 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1916,26 +1916,6 @@ flush_batch(struct zink_context *ctx, bool sync)
}
}
struct zink_batch *
zink_batch_rp(struct zink_context *ctx)
{
struct zink_batch *batch = &ctx->batch;
if (!batch->in_rp) {
zink_begin_render_pass(ctx, batch);
assert(ctx->framebuffer && ctx->framebuffer->rp);
}
return batch;
}
struct zink_batch *
zink_batch_no_rp(struct zink_context *ctx)
{
struct zink_batch *batch = &ctx->batch;
zink_end_render_pass(ctx, batch);
assert(!batch->in_rp);
return batch;
}
void
zink_flush_queue(struct zink_context *ctx)
{

37
src/gallium/drivers/zink/zink_context.h
View File

@@ -321,12 +321,6 @@ zink_fb_clear_enabled(const struct zink_context *ctx, unsigned idx)
return ctx->clears_enabled & (PIPE_CLEAR_COLOR0 << idx);
}
struct zink_batch *
zink_batch_rp(struct zink_context *ctx);
struct zink_batch *
zink_batch_no_rp(struct zink_context *ctx);
void
zink_fence_wait(struct pipe_context *ctx);
@@ -363,6 +357,31 @@ zink_update_descriptor_refs(struct zink_context *ctx, bool compute);
void
zink_init_vk_sample_locations(struct zink_context *ctx, VkSampleLocationsInfoEXT *loc);
void
zink_begin_render_pass(struct zink_context *ctx,
struct zink_batch *batch);
void
zink_end_render_pass(struct zink_context *ctx, struct zink_batch *batch);
static inline struct zink_batch *
zink_batch_rp(struct zink_context *ctx)
{
struct zink_batch *batch = &ctx->batch;
if (!batch->in_rp) {
zink_begin_render_pass(ctx, batch);
}
return batch;
}
static inline struct zink_batch *
zink_batch_no_rp(struct zink_context *ctx)
{
struct zink_batch *batch = &ctx->batch;
zink_end_render_pass(ctx, batch);
assert(!batch->in_rp);
return batch;
}
static inline VkPipelineStageFlags
zink_pipeline_flags_from_pipe_stage(enum pipe_shader_type pstage)
{
@@ -394,12 +413,6 @@ zink_init_grid_functions(struct zink_context *ctx);
#endif
#ifndef __cplusplus
void
zink_begin_render_pass(struct zink_context *ctx,
struct zink_batch *batch);
void
zink_end_render_pass(struct zink_context *ctx, struct zink_batch *batch);
VkPipelineStageFlags
zink_pipeline_flags_from_stage(VkShaderStageFlagBits stage);