From ba4bc54dea1f1221adc03f28a65f7438f8cbfc13 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 1 Oct 2020 09:37:08 -0400 Subject: [PATCH] zink: rename zink_context::buffers -> vertex_buffers (and usage mask) this is more descriptive Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_blit.c | 2 +- src/gallium/drivers/zink/zink_context.c | 2 +- src/gallium/drivers/zink/zink_context.h | 4 ++-- src/gallium/drivers/zink/zink_draw.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index 4d6bdcf..cdcda6f 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -230,7 +230,7 @@ zink_blit_begin(struct zink_context *ctx, enum zink_blit_flags flags) util_blitter_save_vertex_elements(ctx->blitter, ctx->element_state); util_blitter_save_viewport(ctx->blitter, ctx->vp_state.viewport_states); - util_blitter_save_vertex_buffer_slot(ctx->blitter, ctx->buffers); + util_blitter_save_vertex_buffer_slot(ctx->blitter, ctx->vertex_buffers); util_blitter_save_vertex_shader(ctx->blitter, ctx->gfx_stages[PIPE_SHADER_VERTEX]); util_blitter_save_tessctrl_shader(ctx->blitter, ctx->gfx_stages[PIPE_SHADER_TESS_CTRL]); util_blitter_save_tesseval_shader(ctx->blitter, ctx->gfx_stages[PIPE_SHADER_TESS_EVAL]); diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 684939d..bcec36e 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -505,7 +505,7 @@ zink_set_vertex_buffers(struct pipe_context *pctx, { struct zink_context *ctx = zink_context(pctx); - util_set_vertex_buffers_mask(ctx->buffers, &ctx->buffers_enabled_mask, + util_set_vertex_buffers_mask(ctx->vertex_buffers, &ctx->vertex_buffers_enabled_mask, buffers, start_slot, num_buffers, unbind_num_trailing_slots, take_ownership); } diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h index 141bfc3..f7c068d 100644 --- a/src/gallium/drivers/zink/zink_context.h +++ b/src/gallium/drivers/zink/zink_context.h @@ -151,8 +151,8 @@ struct zink_context { struct zink_framebuffer *framebuffer; struct zink_framebuffer_clear fb_clears[PIPE_MAX_COLOR_BUFS + 1]; - struct pipe_vertex_buffer buffers[PIPE_MAX_ATTRIBS]; - uint32_t buffers_enabled_mask; + struct pipe_vertex_buffer vertex_buffers[PIPE_MAX_ATTRIBS]; + uint32_t vertex_buffers_enabled_mask; void *sampler_states[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS]; VkSampler samplers[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS]; diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c index 030e294..345ff7e 100644 --- a/src/gallium/drivers/zink/zink_draw.c +++ b/src/gallium/drivers/zink/zink_draw.c @@ -122,7 +122,7 @@ barrier_vertex_buffers(struct zink_context *ctx) { const struct zink_vertex_elements_state *elems = ctx->element_state; for (unsigned i = 0; i < elems->hw_state.num_bindings; i++) { - struct pipe_vertex_buffer *vb = ctx->buffers + ctx->element_state->binding_map[i]; + struct pipe_vertex_buffer *vb = ctx->vertex_buffers + ctx->element_state->binding_map[i]; assert(vb); if (vb->buffer.resource) { struct zink_resource *res = zink_resource(vb->buffer.resource); @@ -167,7 +167,7 @@ zink_bind_vertex_buffers(struct zink_batch *batch, struct zink_context *ctx) return; for (unsigned i = 0; i < elems->hw_state.num_bindings; i++) { - struct pipe_vertex_buffer *vb = ctx->buffers + ctx->element_state->binding_map[i]; + struct pipe_vertex_buffer *vb = ctx->vertex_buffers + ctx->element_state->binding_map[i]; assert(vb); if (vb->buffer.resource) { struct zink_resource *res = zink_resource(vb->buffer.resource); @@ -711,7 +711,7 @@ zink_draw_vbo(struct pipe_context *pctx, if (!zink_screen(pctx->screen)->info.have_EXT_extended_dynamic_state) { for (unsigned i = 0; i < ctx->element_state->hw_state.num_bindings; i++) { unsigned binding = ctx->element_state->binding_map[i]; - const struct pipe_vertex_buffer *vb = ctx->buffers + binding; + const struct pipe_vertex_buffer *vb = ctx->vertex_buffers + binding; if (ctx->gfx_pipeline_state.bindings[i].stride != vb->stride) { ctx->gfx_pipeline_state.bindings[i].stride = vb->stride; ctx->gfx_pipeline_state.dirty = true; -- 2.7.4