From 5f0a8fbcc87ef6bc1121ecdbcda0c5e82f585295 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 13 Sep 2016 13:28:09 +0200 Subject: [PATCH] radeonsi: cosmetic changes in si_shader.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle Reviewed-by: Edward O'Callaghan --- src/gallium/drivers/radeonsi/si_shader.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index d61f4ff..db7eb4e 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -105,8 +105,8 @@ struct si_shader_context unsigned uniform_md_kind; LLVMValueRef empty_md; + /* Preloaded descriptors. */ LLVMValueRef const_buffers[SI_NUM_CONST_BUFFERS]; - LLVMValueRef lds; LLVMValueRef shader_buffers[SI_NUM_SHADER_BUFFERS]; LLVMValueRef sampler_views[SI_NUM_SAMPLERS]; LLVMValueRef sampler_states[SI_NUM_SAMPLERS]; @@ -114,6 +114,8 @@ struct si_shader_context LLVMValueRef images[SI_NUM_IMAGES]; LLVMValueRef esgs_ring; LLVMValueRef gsvs_ring[4]; + + LLVMValueRef lds; LLVMValueRef gs_next_vertex[4]; LLVMValueRef return_value; @@ -5843,7 +5845,7 @@ static void create_function(struct si_shader_context *ctx) declare_tess_lds(ctx); } -static void preload_constants(struct si_shader_context *ctx) +static void preload_constant_buffers(struct si_shader_context *ctx) { struct lp_build_tgsi_context *bld_base = &ctx->radeon_bld.soa.bld_base; struct gallivm_state *gallivm = bld_base->base.gallivm; @@ -6777,7 +6779,7 @@ int si_compile_tgsi_shader(struct si_screen *sscreen, create_meta_data(&ctx); create_function(&ctx); - preload_constants(&ctx); + preload_constant_buffers(&ctx); preload_shader_buffers(&ctx); preload_samplers(&ctx); preload_images(&ctx); -- 2.7.4