summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2020-03-18 15:03:45 +0100
committerMarge Bot <eric+marge@anholt.net>2020-03-18 21:31:47 +0000
commit56de6f698e3f164d97f132203e8159ef0b8e9bb8 (patch)
treecae5066a2b6d2d49d20ce4e48753e402fa58f60b
parent46187bb54fe7a0ccfbafa09c5a168fb45da172d4 (diff)
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 <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4227> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4227>
-rw-r--r--src/amd/vulkan/radv_pipeline.c9
1 files 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;
}