radeonsi: cosmetic changes in si_shader.c
authorMarek Olšák <marek.olsak@amd.com>
Tue, 13 Sep 2016 11:28:09 +0000 (13:28 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Wed, 14 Sep 2016 10:32:59 +0000 (12:32 +0200)
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
src/gallium/drivers/radeonsi/si_shader.c

index d61f4ff7172e4650cea3c83fb48a81f56053cf86..db7eb4e6b3b98363ff107a33ee6957b9d5e1ebf3 100644 (file)
@@ -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);