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

zink: use zink_program in zink_batch_reference_program()

Browse Source 
this is a little nicer

no functional changes

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9273>
This commit is contained in:
Mike Blumenkrantz
2020-10-02 13:18:21 -04:00
committed by Marge Bot
parent 5503ffecfb
commit 747caaa83d
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/zink/zink_batch.c
View File

@@ -197,12 +197,12 @@ zink_batch_reference_sampler_view(struct zink_batch *batch,
void void
zink_batch_reference_program(struct zink_batch *batch, zink_batch_reference_program(struct zink_batch *batch,
struct pipe_reference *prog) struct zink_program *pg)
{ {
struct set_entry *entry = _mesa_set_search(batch->programs, prog); struct set_entry *entry = _mesa_set_search(batch->programs, pg);
if (!entry) { if (!entry) {
entry = _mesa_set_add(batch->programs, prog); entry = _mesa_set_add(batch->programs, pg);
pipe_reference(NULL, prog); pipe_reference(NULL, &pg->reference);
} }
batch->has_work = true; batch->has_work = true;
} }

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

@@ -34,6 +34,7 @@ struct pipe_reference;
struct zink_context; struct zink_context;
struct zink_fence; struct zink_fence;
struct zink_framebuffer; struct zink_framebuffer;
struct zink_program;
struct zink_render_pass; struct zink_render_pass;
struct zink_resource; struct zink_resource;
struct zink_sampler_view; struct zink_sampler_view;
@@ -85,7 +86,7 @@ zink_batch_reference_sampler_view(struct zink_batch *batch,
void void
zink_batch_reference_program(struct zink_batch *batch, zink_batch_reference_program(struct zink_batch *batch,
struct pipe_reference *prog); struct zink_program *pg);
void void
zink_batch_reference_surface(struct zink_batch *batch, zink_batch_reference_surface(struct zink_batch *batch,

4
src/gallium/drivers/zink/zink_draw.c
View File

@@ -520,9 +520,9 @@ update_descriptors(struct zink_context *ctx, struct zink_screen *screen, bool is
} }
if (is_compute) if (is_compute)
zink_batch_reference_program(batch, &ctx->curr_compute->base.reference); zink_batch_reference_program(batch, &ctx->curr_compute->base);
else else
zink_batch_reference_program(batch, &ctx->curr_program->base.reference); zink_batch_reference_program(batch, &ctx->curr_program->base);
if (batch->descs_used + num_descriptors >= batch->max_descs) { if (batch->descs_used + num_descriptors >= batch->max_descs) {
if (is_compute) if (is_compute)