radv: clean up setting partial_es_wave for distributed tess on VI
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Thu, 8 Nov 2018 13:00:36 +0000 (14:00 +0100)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Mon, 12 Nov 2018 08:35:44 +0000 (09:35 +0100)
Only needed when the pipeline actually uses tessellation. I don't
think that changes anything, except improving readability.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/vulkan/radv_pipeline.c

index bced19573c1e855cbfd737f5bdeeb262331084f1..f999383018288ffc951be32440d1f732e2affb68 100644 (file)
@@ -3371,14 +3371,8 @@ radv_compute_ia_multi_vgt_param_helpers(struct radv_pipeline *pipeline,
        else
                ia_multi_vgt_param.primgroup_size = 128; /* recommended without a GS */
 
-       ia_multi_vgt_param.partial_es_wave = false;
-       if (pipeline->device->has_distributed_tess) {
-               if (radv_pipeline_has_gs(pipeline)) {
-                       if (device->physical_device->rad_info.chip_class <= VI)
-                               ia_multi_vgt_param.partial_es_wave = true;
-               }
-       }
        /* GS requirement. */
+       ia_multi_vgt_param.partial_es_wave = false;
        if (radv_pipeline_has_gs(pipeline) && device->physical_device->rad_info.chip_class <= VI)
                if (SI_GS_PER_ES / ia_multi_vgt_param.primgroup_size >= pipeline->device->gs_table_depth - 3)
                        ia_multi_vgt_param.partial_es_wave = true;
@@ -3425,6 +3419,9 @@ radv_compute_ia_multi_vgt_param_helpers(struct radv_pipeline *pipeline,
                /* Needed for 028B6C_DISTRIBUTION_MODE != 0 */
                if (device->has_distributed_tess) {
                        if (radv_pipeline_has_gs(pipeline)) {
+                               if (device->physical_device->rad_info.chip_class <= VI)
+                                       ia_multi_vgt_param.partial_es_wave = true;
+
                                if (device->physical_device->rad_info.family == CHIP_TONGA ||
                                    device->physical_device->rad_info.family == CHIP_FIJI ||
                                    device->physical_device->rad_info.family == CHIP_POLARIS10 ||