1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-31 14:52:11 +01:00

[dxvk] Enable VK_KHR_create_renderpass2 if available

This commit is contained in:
Philip Rebohle 2019-08-13 12:33:26 +02:00
parent 1999ca9dd4
commit d127c08487
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 10 additions and 1 deletions

View File

@ -245,7 +245,7 @@ namespace dxvk {
Rc<DxvkDevice> DxvkAdapter::createDevice(std::string clientApi, DxvkDeviceFeatures enabledFeatures) { Rc<DxvkDevice> DxvkAdapter::createDevice(std::string clientApi, DxvkDeviceFeatures enabledFeatures) {
DxvkDeviceExtensions devExtensions; DxvkDeviceExtensions devExtensions;
std::array<DxvkExt*, 23> devExtensionList = {{ std::array<DxvkExt*, 24> devExtensionList = {{
&devExtensions.amdMemoryOverallocationBehaviour, &devExtensions.amdMemoryOverallocationBehaviour,
&devExtensions.amdShaderFragmentMask, &devExtensions.amdShaderFragmentMask,
&devExtensions.extConditionalRendering, &devExtensions.extConditionalRendering,
@ -258,6 +258,7 @@ namespace dxvk {
&devExtensions.extShaderViewportIndexLayer, &devExtensions.extShaderViewportIndexLayer,
&devExtensions.extTransformFeedback, &devExtensions.extTransformFeedback,
&devExtensions.extVertexAttributeDivisor, &devExtensions.extVertexAttributeDivisor,
&devExtensions.khrCreateRenderPass2,
&devExtensions.khrDedicatedAllocation, &devExtensions.khrDedicatedAllocation,
&devExtensions.khrDescriptorUpdateTemplate, &devExtensions.khrDescriptorUpdateTemplate,
&devExtensions.khrDrawIndirectCount, &devExtensions.khrDrawIndirectCount,

View File

@ -270,6 +270,7 @@ namespace dxvk {
DxvkExt extShaderViewportIndexLayer = { VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt extShaderViewportIndexLayer = { VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt extTransformFeedback = { VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt extTransformFeedback = { VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt extVertexAttributeDivisor = { VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt extVertexAttributeDivisor = { VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrCreateRenderPass2 = { VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrDedicatedAllocation = { VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME, DxvkExtMode::Required }; DxvkExt khrDedicatedAllocation = { VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME, DxvkExtMode::Required };
DxvkExt khrDescriptorUpdateTemplate = { VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME, DxvkExtMode::Required }; DxvkExt khrDescriptorUpdateTemplate = { VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME, DxvkExtMode::Required };
DxvkExt khrDrawIndirectCount = { VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrDrawIndirectCount = { VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME, DxvkExtMode::Optional };

View File

@ -267,6 +267,13 @@ namespace dxvk::vk {
VULKAN_FN(vkCmdEndRenderPass); VULKAN_FN(vkCmdEndRenderPass);
VULKAN_FN(vkCmdExecuteCommands); VULKAN_FN(vkCmdExecuteCommands);
#ifdef VK_KHR_create_renderpass2
VULKAN_FN(vkCreateRenderPass2KHR);
VULKAN_FN(vkCmdBeginRenderPass2KHR);
VULKAN_FN(vkCmdNextSubpass2KHR);
VULKAN_FN(vkCmdEndRenderPass2KHR);
#endif
#ifdef VK_KHR_descriptor_update_template #ifdef VK_KHR_descriptor_update_template
VULKAN_FN(vkCreateDescriptorUpdateTemplateKHR); VULKAN_FN(vkCreateDescriptorUpdateTemplateKHR);
VULKAN_FN(vkDestroyDescriptorUpdateTemplateKHR); VULKAN_FN(vkDestroyDescriptorUpdateTemplateKHR);