diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 709039e8..d848d5c4 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -72,7 +72,6 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_SPIRV_1_4, KHR_spirv_1_4), VK_EXTENSION(KHR_SHADER_FLOAT_CONTROLS, KHR_shader_float_controls), VK_EXTENSION(KHR_FRAGMENT_SHADING_RATE, KHR_fragment_shading_rate), - VK_EXTENSION(KHR_CREATE_RENDERPASS_2, KHR_create_renderpass2), VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), VK_EXTENSION(KHR_SEPARATE_DEPTH_STENCIL_LAYOUTS, KHR_separate_depth_stencil_layouts), VK_EXTENSION(KHR_SHADER_INTEGER_DOT_PRODUCT, KHR_shader_integer_dot_product), @@ -1921,12 +1920,6 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, return E_INVALIDARG; } - if (!vulkan_info->KHR_create_renderpass2) - { - ERR("KHR_create_renderpass2 is not supported by this implementation. This is required for correct operation.\n"); - return E_INVALIDARG; - } - if (!physical_device_info->separate_depth_stencil_layout_features.separateDepthStencilLayouts) { ERR("separateDepthStencilLayouts is not supported by this implementation. This is required for correct operation.\n"); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 89c51261..fbf22ea0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -120,7 +120,6 @@ struct vkd3d_vulkan_info bool KHR_spirv_1_4; bool KHR_shader_float_controls; bool KHR_fragment_shading_rate; - bool KHR_create_renderpass2; bool KHR_sampler_mirror_clamp_to_edge; bool KHR_separate_depth_stencil_layouts; bool KHR_shader_integer_dot_product; @@ -325,17 +324,6 @@ struct vkd3d_gpu_va_slab void *ptr; }; -enum vkd3d_render_pass_key_flag -{ - VKD3D_RENDER_PASS_KEY_DEPTH_ENABLE = (1u << 0), - VKD3D_RENDER_PASS_KEY_STENCIL_ENABLE = (1u << 1), - VKD3D_RENDER_PASS_KEY_DEPTH_WRITE = (1u << 2), - VKD3D_RENDER_PASS_KEY_STENCIL_WRITE = (1u << 3), - - VKD3D_RENDER_PASS_KEY_DEPTH_STENCIL_ENABLE = (VKD3D_RENDER_PASS_KEY_DEPTH_ENABLE | VKD3D_RENDER_PASS_KEY_STENCIL_ENABLE), - VKD3D_RENDER_PASS_KEY_DEPTH_STENCIL_WRITE = (VKD3D_RENDER_PASS_KEY_DEPTH_WRITE | VKD3D_RENDER_PASS_KEY_STENCIL_WRITE), -}; - struct vkd3d_private_store { pthread_mutex_t mutex; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index da84ee95..a6e44a65 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -62,7 +62,6 @@ VK_DEVICE_PFN(vkAllocateDescriptorSets) VK_DEVICE_PFN(vkAllocateMemory) VK_DEVICE_PFN(vkBeginCommandBuffer) VK_DEVICE_PFN(vkCmdBeginQuery) -VK_DEVICE_PFN(vkCmdBeginRenderPass) VK_DEVICE_PFN(vkCmdBindDescriptorSets) VK_DEVICE_PFN(vkCmdBindIndexBuffer) VK_DEVICE_PFN(vkCmdBindPipeline) @@ -78,7 +77,6 @@ VK_DEVICE_PFN(vkCmdDrawIndexed) VK_DEVICE_PFN(vkCmdDrawIndexedIndirect) VK_DEVICE_PFN(vkCmdDrawIndirect) VK_DEVICE_PFN(vkCmdEndQuery) -VK_DEVICE_PFN(vkCmdEndRenderPass) VK_DEVICE_PFN(vkCmdExecuteCommands) VK_DEVICE_PFN(vkCmdFillBuffer) VK_DEVICE_PFN(vkCmdNextSubpass) @@ -114,7 +112,6 @@ VK_DEVICE_PFN(vkCreateImageView) VK_DEVICE_PFN(vkCreatePipelineCache) VK_DEVICE_PFN(vkCreatePipelineLayout) VK_DEVICE_PFN(vkCreateQueryPool) -VK_DEVICE_PFN(vkCreateRenderPass) VK_DEVICE_PFN(vkCreateSampler) VK_DEVICE_PFN(vkCreateSemaphore) VK_DEVICE_PFN(vkCreateShaderModule) @@ -132,7 +129,6 @@ VK_DEVICE_PFN(vkDestroyPipeline) VK_DEVICE_PFN(vkDestroyPipelineCache) VK_DEVICE_PFN(vkDestroyPipelineLayout) VK_DEVICE_PFN(vkDestroyQueryPool) -VK_DEVICE_PFN(vkDestroyRenderPass) VK_DEVICE_PFN(vkDestroySampler) VK_DEVICE_PFN(vkDestroySemaphore) VK_DEVICE_PFN(vkDestroyShaderModule) @@ -156,7 +152,6 @@ VK_DEVICE_PFN(vkGetImageSparseMemoryRequirements2) VK_DEVICE_PFN(vkGetImageSubresourceLayout) VK_DEVICE_PFN(vkGetPipelineCacheData) VK_DEVICE_PFN(vkGetQueryPoolResults) -VK_DEVICE_PFN(vkGetRenderAreaGranularity) VK_DEVICE_PFN(vkInvalidateMappedMemoryRanges) VK_DEVICE_PFN(vkMapMemory) VK_DEVICE_PFN(vkMergePipelineCaches) @@ -211,12 +206,6 @@ VK_DEVICE_EXT_PFN(vkCmdCopyAccelerationStructureKHR) VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFragmentShadingRatesKHR) VK_DEVICE_EXT_PFN(vkCmdSetFragmentShadingRateKHR) -/* VK_KHR_create_renderpass2 */ -VK_DEVICE_EXT_PFN(vkCmdBeginRenderPass2KHR) -VK_DEVICE_EXT_PFN(vkCmdEndRenderPass2KHR) -VK_DEVICE_EXT_PFN(vkCmdNextSubpass2KHR) -VK_DEVICE_EXT_PFN(vkCreateRenderPass2KHR) - /* VK_KHR_bind_memory2 */ VK_DEVICE_EXT_PFN(vkBindBufferMemory2KHR) VK_DEVICE_EXT_PFN(vkBindImageMemory2KHR)