Fix validation error about subgroup_size_control extension

0cc4m · 0cc4m · commit 914a82da4ddd · 2025-01-09T16:24:00.000+01:00
diff --git a/ggml/src/ggml-vulkan/ggml-vulkan.cpp b/ggml/src/ggml-vulkan/ggml-vulkan.cpp
@@ -2277,6 +2277,7 @@ static vk_device ggml_vk_get_device(size_t idx) {
         if (device->subgroup_size_control) {
             device->subgroup_min_size = subgroup_size_control_props.minSubgroupSize;
             device->subgroup_max_size = subgroup_size_control_props.maxSubgroupSize;
+            device_extensions.push_back("VK_EXT_subgroup_size_control");
         }
 
         device->subgroup_size_control = device->subgroup_size_control &&
@@ -2285,7 +2286,6 @@ static vk_device ggml_vk_get_device(size_t idx) {
 
         if (device->subgroup_size_control) {
             device->subgroup_require_full_support = subgroup_size_control_features.computeFullSubgroups;
-            device_extensions.push_back("VK_EXT_subgroup_size_control");
         }
 
 #if defined(VK_KHR_cooperative_matrix)

Original file line number	Diff line number	Diff line change
`@@ -2277,6 +2277,7 @@ static vk_device ggml_vk_get_device(size_t idx) {`
`2277`	`2277`	`if (device->subgroup_size_control) {`
`2278`	`2278`	`device->subgroup_min_size = subgroup_size_control_props.minSubgroupSize;`
`2279`	`2279`	`device->subgroup_max_size = subgroup_size_control_props.maxSubgroupSize;`
	`2280`	`+ device_extensions.push_back("VK_EXT_subgroup_size_control");`
`2280`	`2281`	`}`
`2281`	`2282`
`2282`	`2283`	`device->subgroup_size_control = device->subgroup_size_control &&`
`@@ -2285,7 +2286,6 @@ static vk_device ggml_vk_get_device(size_t idx) {`
`2285`	`2286`
`2286`	`2287`	`if (device->subgroup_size_control) {`
`2287`	`2288`	`device->subgroup_require_full_support = subgroup_size_control_features.computeFullSubgroups;`
`2288`		`- device_extensions.push_back("VK_EXT_subgroup_size_control");`
`2289`	`2289`	`}`
`2290`	`2290`
`2291`	`2291`	`#if defined(VK_KHR_cooperative_matrix)`