Add support for VK_KHR_shader_quad_control

Author: squidbus

ExternalRevisions/SPIRV-Cross_repo_revision

@@ -1 +1 @@
-f1cb5b6634c58be69c327450d0023fb061f0f650
+8d724ab32708129e45846a30005348d10ba31a06

MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm

@@ -618,6 +618,12 @@
 				shaderReconvergenceFeatures->shaderMaximalReconvergence = _gpuCapabilities.isAppleGPU;
 				break;
 			}
+			case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR: {
+				auto* shaderQuadControlFeatures = (VkPhysicalDeviceShaderQuadControlFeaturesKHR*)next;
+				// Depends on maximal reconvergence, which in turn depends on Apple GPU.
+				shaderQuadControlFeatures->shaderQuadControl = _gpuCapabilities.isAppleGPU && _metalFeatures.quadPermute;
+				break;
+			}
 			case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR: {
 				auto* shaderRelaxedFeatures = (VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR*)next;
 				shaderRelaxedFeatures->shaderRelaxedExtendedInstruction = true;
@@ -3756,6 +3762,9 @@ static uint32_t mvkGetEntryProperty(io_registry_entry_t entry, CFStringRef prope
 		pWritableExtns->vk_KHR_shader_subgroup_uniform_control_flow.enabled = false;
 		pWritableExtns->vk_KHR_shader_maximal_reconvergence.enabled = false;
 	}
+	if (!_gpuCapabilities.isAppleGPU || !_metalFeatures.quadPermute) {
+		pWritableExtns->vk_KHR_shader_quad_control.enabled = false;
+	}
 	if (!_metalFeatures.samplerMirrorClampToEdge) {
 		pWritableExtns->vk_KHR_sampler_mirror_clamp_to_edge.enabled = false;
 	}

MoltenVK/MoltenVK/GPUObjects/MVKDeviceFeatureStructs.def

@@ -83,6 +83,7 @@ MVK_DEVICE_FEATURE_EXTN(PortabilitySubset,                PORTABILITY_SUBSET,
 MVK_DEVICE_FEATURE_EXTN(PresentId,                        PRESENT_ID,                           KHR,   1)
 MVK_DEVICE_FEATURE_EXTN(PresentWait,                      PRESENT_WAIT,                         KHR,   1)
 MVK_DEVICE_FEATURE_EXTN(ShaderMaximalReconvergence,       SHADER_MAXIMAL_RECONVERGENCE,         KHR,   1)
+MVK_DEVICE_FEATURE_EXTN(ShaderQuadControl,                SHADER_QUAD_CONTROL,                  KHR,   1)
 MVK_DEVICE_FEATURE_EXTN(ShaderRelaxedExtendedInstruction, SHADER_RELAXED_EXTENDED_INSTRUCTION,  KHR,   1)
 MVK_DEVICE_FEATURE_EXTN(ShaderSubgroupUniformControlFlow, SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW, KHR,   1)
 MVK_DEVICE_FEATURE_EXTN(4444Formats,                      4444_FORMATS,                         EXT,   2)

MoltenVK/MoltenVK/Layers/MVKExtensions.def

@@ -100,6 +100,7 @@ MVK_EXTENSION(KHR_shader_float_controls,                KHR_SHADER_FLOAT_CONTROL
 MVK_EXTENSION(KHR_shader_integer_dot_product,           KHR_SHADER_INTEGER_DOT_PRODUCT,           DEVICE,   10.11,  8.0,  1.0)
 MVK_EXTENSION(KHR_shader_maximal_reconvergence,         KHR_SHADER_MAXIMAL_RECONVERGENCE,         DEVICE,   10.11,  8.0,  1.0)
 MVK_EXTENSION(KHR_shader_non_semantic_info,             KHR_SHADER_NON_SEMANTIC_INFO,             DEVICE,   10.11,  8.0,  1.0)
+MVK_EXTENSION(KHR_shader_quad_control,                  KHR_SHADER_QUAD_CONTROL,                  DEVICE,   10.14, 13.0,  1.0)
 MVK_EXTENSION(KHR_shader_relaxed_extended_instruction,  KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION,  DEVICE,   10.11,  8.0,  1.0)
 MVK_EXTENSION(KHR_shader_subgroup_extended_types,       KHR_SHADER_SUBGROUP_EXTENDED_TYPES,       DEVICE,   10.14, 13.0,  1.0)
 MVK_EXTENSION(KHR_shader_subgroup_rotate,               KHR_SHADER_SUBGROUP_ROTATE,               DEVICE,   10.14, 13.0,  1.0)

fetchDependencies

@@ -336,7 +336,7 @@ if [ ! "$SPIRV_CROSS_ROOT" = "" ]; then
 	rm -rf ${REPO_NAME}
 	ln -sfn ${SPIRV_CROSS_ROOT} ${REPO_NAME}
 else
-	REPO_URL="https://github.com/KhronosGroup/${REPO_NAME}.git"
+	REPO_URL="https://github.com/squidbus/${REPO_NAME}.git"
 	REPO_REV=$(cat "${EXT_REV_DIR}/${REPO_NAME}_repo_revision")
 
 	update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV}