From c8b6f42e25369d149a28dfab1eeb48ff893894ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 9 Jun 2017 19:33:24 +0200 Subject: [PATCH] radeonsi: rename si_vertex_element -> si_vertex_elements MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_descriptors.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.h | 2 +- src/gallium/drivers/radeonsi/si_state.c | 6 +++--- src/gallium/drivers/radeonsi/si_state.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index b04d108a543..af68ac91468 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -1027,7 +1027,7 @@ static void si_vertex_buffers_begin_new_cs(struct si_context *sctx) bool si_upload_vertex_buffer_descriptors(struct si_context *sctx) { - struct si_vertex_element *velems = sctx->vertex_elements; + struct si_vertex_elements *velems = sctx->vertex_elements; struct si_descriptors *desc = &sctx->vertex_buffers; unsigned i, count; unsigned desc_list_byte_size; diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 0aaec797ac9..46b095d3b14 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -290,7 +290,7 @@ struct si_context { struct si_cs_shader_state cs_shader_state; /* shader information */ - struct si_vertex_element *vertex_elements; + struct si_vertex_elements *vertex_elements; unsigned sprite_coord_enable; bool flatshade; bool do_update_shaders; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index f4d6ae1a986..3b15545fc48 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -3716,7 +3716,7 @@ static void *si_create_vertex_elements(struct pipe_context *ctx, const struct pipe_vertex_element *elements) { struct si_screen *sscreen = (struct si_screen*)ctx->screen; - struct si_vertex_element *v = CALLOC_STRUCT(si_vertex_element); + struct si_vertex_elements *v = CALLOC_STRUCT(si_vertex_elements); bool used[SI_NUM_VERTEX_BUFFERS] = {}; int i; @@ -3856,8 +3856,8 @@ static void *si_create_vertex_elements(struct pipe_context *ctx, static void si_bind_vertex_elements(struct pipe_context *ctx, void *state) { struct si_context *sctx = (struct si_context *)ctx; - struct si_vertex_element *old = sctx->vertex_elements; - struct si_vertex_element *v = (struct si_vertex_element*)state; + struct si_vertex_elements *old = sctx->vertex_elements; + struct si_vertex_elements *v = (struct si_vertex_elements*)state; sctx->vertex_elements = v; sctx->vertex_buffers_dirty = true; diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 8de86753f6d..63a1713aac0 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -98,7 +98,7 @@ struct si_stencil_ref { struct si_dsa_stencil_ref_part dsa_part; }; -struct si_vertex_element +struct si_vertex_elements { unsigned count; unsigned first_vb_use_mask; -- 2.30.2