diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2018-01-09 16:01:10 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2018-01-10 12:31:53 +0100 |
| commit | 4e701cf75c89dbe8dd731698f2652beb7863e69b (patch) | |
| tree | 8578535e71a1ae906f1906c504b75aeea159ae95 | |
| parent | 232c418af5fabbfcd97104028d489d65cfdbc3cb (diff) | |
radv/gfx9: calculate the number of ES VGPRs for merged shaders
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
| -rw-r--r-- | src/amd/vulkan/radv_shader.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 58d991e4526..6f622dd9968 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -416,7 +416,15 @@ radv_fill_shader_variant(struct radv_device *device, stage == MESA_SHADER_GEOMETRY) { struct ac_shader_info *info = &variant->info.info; unsigned es_type = variant->info.gs.es_type; - unsigned gs_vgpr_comp_cnt; + unsigned gs_vgpr_comp_cnt, es_vgpr_comp_cnt; + + if (es_type == MESA_SHADER_VERTEX) { + es_vgpr_comp_cnt = variant->info.vs.vgpr_comp_cnt; + } else if (es_type == MESA_SHADER_TESS_EVAL) { + es_vgpr_comp_cnt = 3; + } else { + assert(!"invalid shader ES type"); + } /* If offsets 4, 5 are used, GS_VGPR_COMP_CNT is ignored and * VGPR[0:4] are always loaded. @@ -430,9 +438,8 @@ radv_fill_shader_variant(struct radv_device *device, else gs_vgpr_comp_cnt = 0; /* VGPR0 contains offsets 0, 1 */ - /* TODO: Figure out how many we actually need. */ variant->rsrc1 |= S_00B228_GS_VGPR_COMP_CNT(gs_vgpr_comp_cnt); - variant->rsrc2 |= S_00B22C_ES_VGPR_COMP_CNT(3) | + variant->rsrc2 |= S_00B22C_ES_VGPR_COMP_CNT(es_vgpr_comp_cnt) | S_00B22C_OC_LDS_EN(es_type == MESA_SHADER_TESS_EVAL); } else if (device->physical_device->rad_info.chip_class >= GFX9 && stage == MESA_SHADER_TESS_CTRL) |