From 56de6f698e3f164d97f132203e8159ef0b8e9bb8 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 18 Mar 2020 15:03:45 +0100 Subject: [PATCH] radv: remove wrong assert that checks compute subgroup size Ooops. For some reasons, I have been confused with Wave32 on GFX10, but it's still possible to require a specific subgroup size if only Wave64 is supported. Fixes: 672d1061998 ("radv/gfx10: fix required subgroup size with VK_EXT_subgroup_size_control") Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Tested-by: Marge Bot Part-of: --- src/amd/vulkan/radv_pipeline.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index ef88dfe9468..01db4c93e17 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -2812,11 +2812,10 @@ void radv_create_shaders(struct radv_pipeline *pipeline, radv_start_feedback(stage_feedbacks[i]); if (key->compute_subgroup_size) { - /* Only GFX10+ and compute shaders currently support - * requiring a specific subgroup size. - */ - assert(device->physical_device->rad_info.chip_class >= GFX10 && - i == MESA_SHADER_COMPUTE); + /* Only compute shaders currently support requiring a + * specific subgroup size. + */ + assert(i == MESA_SHADER_COMPUTE); subgroup_size = key->compute_subgroup_size; ballot_bit_size = key->compute_subgroup_size; } -- 2.30.2