vulkan: add more optional extensions

VK_KHR_dedicated_allocation, VK_KHR_buffer_device_address,
and VK_EXT_memory_budget can get used by VMA.
VK_KHR_spirv_1_4 can get used by the Shader.

VK_KHR_spirv_1_4 depends on VK_KHR_shader_float_controls.
VK_KHR_dedicated_allocation depends on VK_KHR_get_memory_requirements2

src/modules/graphics/vulkan/Graphics.cpp

@@ -492,7 +492,19 @@ Graphics::RendererInfo Graphics::getRendererInfo() const
 	std::stringstream ss;
 	ss << "Vulkan( ";
 	if (optionalDeviceFeatures.extendedDynamicState)
-		ss << VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME << " ";
+		ss << "eds ";
+	if (optionalDeviceFeatures.memoryRequirements2)
+		ss << "mr2 ";
+	if (optionalDeviceFeatures.dedicatedAllocation)
+		ss << "da ";
+	if (optionalDeviceFeatures.bufferDeviceAddress)
+		ss << "bda ";
+	if (optionalDeviceFeatures.memoryBudget)
+		ss << "mb ";
+	if (optionalDeviceFeatures.shaderFloatControls)
+		ss << "sfc ";
+	if (optionalDeviceFeatures.spirv14)
+		ss << "spv14 ";
 	ss << ")";
 
 	info.name = ss.str();
@@ -950,6 +962,11 @@ graphics::Shader::BuiltinUniformData Graphics::getCurrentBuiltinUniformData()
 	return data;
 }
 
+const OptionalDeviceFeatures &Graphics::getEnabledOptionalDeviceExtensions() const
+{
+	return optionalDeviceFeatures;
+}
+
 static void checkOptionalInstanceExtensions(OptionalInstanceExtensions &ext)
 {
 	uint32_t count;
@@ -1189,6 +1206,18 @@ static void findOptionalDeviceExtensions(VkPhysicalDevice physicalDevice, Option
 	{
 		if (strcmp(extension.extensionName, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME) == 0)
 			optionalDeviceFeatures.extendedDynamicState = true;
+		if (strcmp(extension.extensionName, VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME) == 0)
+			optionalDeviceFeatures.memoryRequirements2 = true;
+		if (strcmp(extension.extensionName, VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME) == 0)
+			optionalDeviceFeatures.dedicatedAllocation = true;
+		if (strcmp(extension.extensionName, VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME) == 0)
+			optionalDeviceFeatures.bufferDeviceAddress = true;
+		if (strcmp(extension.extensionName, VK_EXT_MEMORY_BUDGET_EXTENSION_NAME) == 0)
+			optionalDeviceFeatures.memoryBudget = true;
+		if (strcmp(extension.extensionName, VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME) == 0)
+			optionalDeviceFeatures.shaderFloatControls = true;
+		if (strcmp(extension.extensionName, VK_KHR_SPIRV_1_4_EXTENSION_NAME) == 0)
+			optionalDeviceFeatures.spirv14 = true;
 	}
 }
 
@@ -1214,6 +1243,14 @@ void Graphics::createLogicalDevice()
 
     if (optionalDeviceFeatures.extendedDynamicState && !optionalInstanceExtensions.physicalDeviceProperties2)
         optionalDeviceFeatures.extendedDynamicState = false;
+	if (optionalDeviceFeatures.dedicatedAllocation && !optionalDeviceFeatures.memoryRequirements2)
+		optionalDeviceFeatures.dedicatedAllocation = false;
+	if (optionalDeviceFeatures.bufferDeviceAddress && !optionalInstanceExtensions.physicalDeviceProperties2)
+		optionalDeviceFeatures.bufferDeviceAddress = false;
+	if (optionalDeviceFeatures.memoryBudget && !optionalInstanceExtensions.physicalDeviceProperties2)
+		optionalDeviceFeatures.memoryBudget = false;
+	if (optionalDeviceFeatures.spirv14 && !optionalDeviceFeatures.shaderFloatControls)
+		optionalDeviceFeatures.spirv14 = false;
 
 	VkPhysicalDeviceFeatures deviceFeatures{};
 	deviceFeatures.samplerAnisotropy = VK_TRUE;
@@ -1226,9 +1263,20 @@ void Graphics::createLogicalDevice()
 	createInfo.pEnabledFeatures = &deviceFeatures;
 
 	std::vector<const char*> enabledExtensions(deviceExtensions.begin(), deviceExtensions.end());
-
 	if (optionalDeviceFeatures.extendedDynamicState)
 		enabledExtensions.push_back(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);
+	if (optionalDeviceFeatures.memoryRequirements2)
+		enabledExtensions.push_back(VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME);
+	if (optionalDeviceFeatures.dedicatedAllocation)
+		enabledExtensions.push_back(VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME);
+	if (optionalDeviceFeatures.bufferDeviceAddress)
+		enabledExtensions.push_back(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME);
+	if (optionalDeviceFeatures.memoryBudget)
+		enabledExtensions.push_back(VK_EXT_MEMORY_BUDGET_EXTENSION_NAME);
+	if (optionalDeviceFeatures.shaderFloatControls)
+		enabledExtensions.push_back(VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME);
+	if (optionalDeviceFeatures.spirv14)
+		enabledExtensions.push_back(VK_KHR_SPIRV_1_4_EXTENSION_NAME);
 
 	createInfo.enabledExtensionCount = static_cast<uint32_t>(enabledExtensions.size());
 	createInfo.ppEnabledExtensionNames = enabledExtensions.data();
@@ -1284,6 +1332,32 @@ void Graphics::createLogicalDevice()
 		ext.vkCmdSetStencilOpEXT = (PFN_vkCmdSetStencilOpEXT)vkGetDeviceProcAddr(device, "vkCmdSetStencilOpEXT");
 		ext.vkCmdSetStencilTestEnableEXT = (PFN_vkCmdSetStencilTestEnableEXT)vkGetDeviceProcAddr(device, "vkCmdSetStencilTestEnableEXT");
 		ext.vkCmdSetViewportWithCountEXT = (PFN_vkCmdSetViewportWithCountEXT)vkGetDeviceProcAddr(device, "vkCmdSetViewportWithCountEXT");
+#endif
+	}
+
+	if (optionalDeviceFeatures.memoryRequirements2)
+	{
+#ifdef LOVE_ANDROID
+		ext.vkGetBufferMemoryRequirements2KHR = vkGetBufferMemoryRequirements2KHR;
+		ext.vkGetImageMemoryRequirements2KHR = vkGetImageMemoryRequirements2KHR;
+		ext.vkGetImageSparseMemoryRequirements2KHR = vkGetImageSparseMemoryRequirements2KHR;
+#else
+		ext.vkGetBufferMemoryRequirements2KHR = (PFN_vkGetBufferMemoryRequirements2KHR)vkGetDeviceProcAddr(device, "vkGetBufferMemoryRequirements2KHR");
+		ext.vkGetImageMemoryRequirements2KHR = (PFN_vkGetImageMemoryRequirements2KHR)vkGetDeviceProcAddr(device, "vkGetImageMemoryRequirements2KHR");
+		ext.vkGetImageSparseMemoryRequirements2KHR = (PFN_vkGetImageSparseMemoryRequirements2KHR)vkGetDeviceProcAddr(device, "vkGetImageSparseMemoryRequirements2KHR");
+#endif
+	}
+
+	if (optionalDeviceFeatures.bufferDeviceAddress)
+	{
+#ifdef LOVE_ANDROID
+		ext.vkGetBufferDeviceAddressKHR = vkGetBufferDeviceAddressKHR;
+		ext.vkGetBufferOpaqueCaptureAddressKHR = vkGetBufferOpaqueCaptureAddressKHR;
+		ext.vkGetDeviceMemoryOpaqueCaptureAddressKHR = vkGetDeviceMemoryOpaqueCaptureAddressKHR;
+#else
+		ext.vkGetBufferDeviceAddressKHR = (PFN_vkGetBufferDeviceAddressKHR)vkGetDeviceProcAddr(device, "vkGetBufferDeviceAddressKHR");
+		ext.vkGetBufferOpaqueCaptureAddressKHR = (PFN_vkGetBufferOpaqueCaptureAddressKHR)vkGetDeviceProcAddr(device, "vkGetBufferOpaqueCaptureAddressKHR");
+		ext.vkGetDeviceMemoryOpaqueCaptureAddressKHR = (PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR)vkGetDeviceProcAddr(device, "vkGetDeviceMemoryOpaqueCaptureAddressKHR");
 #endif
 	}
 }
@@ -1523,7 +1597,7 @@ VkExtent2D Graphics::chooseSwapExtent(const VkSurfaceCapabilitiesKHR &capabiliti
 	}
 }
 
-VkCompositeAlphaFlagBitsKHR Graphics::chooseCompositeAlpha(const VkSurfaceCapabilitiesKHR& capabilities)
+VkCompositeAlphaFlagBitsKHR Graphics::chooseCompositeAlpha(const VkSurfaceCapabilitiesKHR &capabilities)
 {
 	if (capabilities.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)
 		return VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;

src/modules/graphics/vulkan/Graphics.h

@@ -99,12 +99,31 @@ struct OptionalInstanceExtensions
 
 struct OptionalDeviceFeatures
 {
+	// VK_EXT_extended_dynamic_state
 	bool extendedDynamicState = false;
+
+	// VK_KHR_get_memory_requirements2
+	bool memoryRequirements2 = false;
+
+	// VK_KHR_dedicated_allocation
+	bool dedicatedAllocation = false;
+
+	// VK_KHR_buffer_device_address
+	bool bufferDeviceAddress = false;
+
+	// VK_EXT_memory_budget
+	bool memoryBudget = false;
+
+	// VK_KHR_shader_float_controls
+	bool shaderFloatControls = false;
+
+	// VK_KHR_spirv_1_4
+	bool spirv14 = false;
 };
 
 struct OptionalDeviceExtensionFunctions
 {
-	// extended dynamic state
+	// VK_EXT_extended_dynamic_state
 	PFN_vkCmdSetCullModeEXT vkCmdSetCullModeEXT = nullptr;
 	PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnableEXT = nullptr;
 	PFN_vkCmdSetDepthCompareOpEXT vkCmdSetDepthCompareOpEXT = nullptr;
@@ -116,6 +135,16 @@ struct OptionalDeviceExtensionFunctions
 	PFN_vkCmdSetStencilOpEXT vkCmdSetStencilOpEXT = nullptr;
 	PFN_vkCmdSetStencilTestEnableEXT vkCmdSetStencilTestEnableEXT = nullptr;
 	PFN_vkCmdSetViewportWithCountEXT vkCmdSetViewportWithCountEXT = nullptr;
+
+	// VK_KHR_get_memory_requirements2
+	PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR = nullptr;
+	PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR = nullptr;
+	PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR = nullptr;
+
+	// VK_KHR_buffer_device_address
+	PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR = nullptr;
+	PFN_vkGetBufferOpaqueCaptureAddressKHR vkGetBufferOpaqueCaptureAddressKHR = nullptr;
+	PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptureAddressKHR = nullptr;
 };
 
 struct GraphicsPipelineConfiguration
@@ -288,6 +317,8 @@ public:
 
 	graphics::Shader::BuiltinUniformData getCurrentBuiltinUniformData();
 
+	const OptionalDeviceFeatures &getEnabledOptionalDeviceExtensions() const;
+
 protected:
 	graphics::ShaderStage *newShaderStageInternal(ShaderStageType stage, const std::string &cachekey, const std::string &source, bool gles) override;
 	graphics::Shader *newShaderInternal(StrongRef<love::graphics::ShaderStage> stages[SHADERSTAGE_MAX_ENUM]) override;

src/modules/graphics/vulkan/Shader.cpp

@@ -612,6 +612,8 @@ void Shader::compileShaders()
 
 	device = vgfx->getDevice();
 
+	const auto &enabledExtensions = vgfx->getEnabledOptionalDeviceExtensions();
+
 	for (int i = 0; i < SHADERSTAGE_MAX_ENUM; i++)
 	{
 		if (!stages[i])
@@ -627,7 +629,10 @@ void Shader::compileShaders()
 
 		tshader->setEnvInput(EShSourceGlsl, glslangShaderStage, EShClientVulkan, 450);
 		tshader->setEnvClient(EShClientVulkan, EShTargetVulkan_1_2);
-		tshader->setEnvTarget(EshTargetSpv, EShTargetSpv_1_0);
+		if (enabledExtensions.spirv14)
+			tshader->setEnvTarget(EshTargetSpv, EShTargetSpv_1_4);
+		else
+			tshader->setEnvTarget(EshTargetSpv, EShTargetSpv_1_0);
 		tshader->setAutoMapLocations(true);
 		tshader->setAutoMapBindings(true);
 		tshader->setEnvInputVulkanRulesRelaxed();