diff options
| author | Samuel Pitoiset <[email protected]> | 2018-02-16 10:33:10 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2018-02-20 10:44:59 +0100 |
| commit | 1ac741d690bea8e9a3d2dbc2f8e34deadc2ec072 (patch) | |
| tree | 56ef85a64d8136f00e7b25b737c4a0c61e9e383b /src/amd | |
| parent | b5d111ae763b672c141266760db55e83716d77f9 (diff) | |
ac/nir: move ac_declare_lds_as_pointer() outside of the switch
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index dc471de9773..12f097e2b26 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -1068,8 +1068,6 @@ static void create_function(struct radv_shader_context *ctx, set_loc_shader(ctx, AC_UD_VS_LS_TCS_IN_LAYOUT, &user_sgpr_idx, 1); } - if (ctx->options->key.vs.as_ls) - ac_declare_lds_as_pointer(&ctx->ac); break; case MESA_SHADER_TESS_CTRL: set_vs_specific_input_locs(ctx, stage, has_previous_stage, @@ -1080,7 +1078,6 @@ static void create_function(struct radv_shader_context *ctx, set_loc_shader(ctx, AC_UD_TCS_OFFCHIP_LAYOUT, &user_sgpr_idx, 4); if (ctx->abi.view_index) set_loc_shader(ctx, AC_UD_VIEW_INDEX, &user_sgpr_idx, 1); - ac_declare_lds_as_pointer(&ctx->ac); break; case MESA_SHADER_TESS_EVAL: set_loc_shader(ctx, AC_UD_TES_OFFCHIP_LAYOUT, &user_sgpr_idx, 1); @@ -1102,8 +1099,6 @@ static void create_function(struct radv_shader_context *ctx, &user_sgpr_idx, 2); if (ctx->abi.view_index) set_loc_shader(ctx, AC_UD_VIEW_INDEX, &user_sgpr_idx, 1); - if (has_previous_stage) - ac_declare_lds_as_pointer(&ctx->ac); break; case MESA_SHADER_FRAGMENT: if (ctx->shader_info->info.ps.needs_sample_positions) { @@ -1115,6 +1110,13 @@ static void create_function(struct radv_shader_context *ctx, unreachable("Shader stage not implemented"); } + if (stage == MESA_SHADER_TESS_CTRL || + (stage == MESA_SHADER_VERTEX && ctx->options->key.vs.as_ls) || + /* GFX9 has the ESGS ring buffer in LDS. */ + (stage == MESA_SHADER_GEOMETRY && has_previous_stage)) { + ac_declare_lds_as_pointer(&ctx->ac); + } + ctx->shader_info->num_user_sgprs = user_sgpr_idx; } |