diff --git a/src/d3d11/d3d11_texture.cpp b/src/d3d11/d3d11_texture.cpp index d5c3b92c..f540b3da 100644 --- a/src/d3d11/d3d11_texture.cpp +++ b/src/d3d11/d3d11_texture.cpp @@ -114,7 +114,7 @@ namespace dxvk { if (Dimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D && (m_desc.BindFlags & D3D11_BIND_RENDER_TARGET)) - imageInfo.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; + imageInfo.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT; // Some image formats (i.e. the R32G32B32 ones) are // only supported with linear tiling on most GPUs diff --git a/src/dxvk/dxvk_adapter.cpp b/src/dxvk/dxvk_adapter.cpp index d5bd4a00..69d44d2c 100644 --- a/src/dxvk/dxvk_adapter.cpp +++ b/src/dxvk/dxvk_adapter.cpp @@ -241,7 +241,7 @@ namespace dxvk { DxvkDeviceFeatures enabledFeatures) { DxvkDeviceExtensions devExtensions; - std::array devExtensionList = {{ + std::array devExtensionList = {{ &devExtensions.amdMemoryOverallocationBehaviour, &devExtensions.amdShaderFragmentMask, &devExtensions.extConditionalRendering, @@ -261,8 +261,6 @@ namespace dxvk { &devExtensions.khrDrawIndirectCount, &devExtensions.khrDriverProperties, &devExtensions.khrImageFormatList, - &devExtensions.khrMaintenance1, - &devExtensions.khrMaintenance2, &devExtensions.khrSamplerMirrorClampToEdge, &devExtensions.khrShaderDrawParameters, &devExtensions.khrSwapchain, diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp index cef89760..44ab3185 100644 --- a/src/dxvk/dxvk_context.cpp +++ b/src/dxvk/dxvk_context.cpp @@ -274,7 +274,7 @@ namespace dxvk { bool canUseFb = (srcImage->info().usage & VK_IMAGE_USAGE_SAMPLED_BIT) && (dstImage->info().usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) - && ((dstImage->info().flags & VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR) + && ((dstImage->info().flags & VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT) || (dstImage->info().type != VK_IMAGE_TYPE_3D)); bool useFb = dstImage->info().sampleCount != VK_SAMPLE_COUNT_1_BIT diff --git a/src/dxvk/dxvk_extensions.h b/src/dxvk/dxvk_extensions.h index 0db0c58e..29ebe93e 100644 --- a/src/dxvk/dxvk_extensions.h +++ b/src/dxvk/dxvk_extensions.h @@ -277,8 +277,6 @@ namespace dxvk { DxvkExt khrDrawIndirectCount = { VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrDriverProperties = { VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrImageFormatList = { VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME, DxvkExtMode::Required }; - DxvkExt khrMaintenance1 = { VK_KHR_MAINTENANCE1_EXTENSION_NAME, DxvkExtMode::Required }; - DxvkExt khrMaintenance2 = { VK_KHR_MAINTENANCE2_EXTENSION_NAME, DxvkExtMode::Required }; DxvkExt khrSamplerMirrorClampToEdge = { VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrShaderDrawParameters = { VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, DxvkExtMode::Required }; DxvkExt khrSwapchain = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, DxvkExtMode::Required }; diff --git a/src/dxvk/dxvk_image.cpp b/src/dxvk/dxvk_image.cpp index af8ca3b5..7f86755a 100644 --- a/src/dxvk/dxvk_image.cpp +++ b/src/dxvk/dxvk_image.cpp @@ -217,7 +217,7 @@ namespace dxvk { case VK_IMAGE_VIEW_TYPE_3D: { this->createView(VK_IMAGE_VIEW_TYPE_3D, 1); - if (m_image->info().flags & VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR && m_info.numLevels == 1) { + if (m_image->info().flags & VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT && m_info.numLevels == 1) { this->createView(VK_IMAGE_VIEW_TYPE_2D, 1); this->createView(VK_IMAGE_VIEW_TYPE_2D_ARRAY, m_image->mipLevelExtent(m_info.minLevel).depth); } @@ -247,8 +247,8 @@ namespace dxvk { subresourceRange.baseArrayLayer = m_info.minLayer; subresourceRange.layerCount = numLayers; - VkImageViewUsageCreateInfoKHR viewUsage; - viewUsage.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR; + VkImageViewUsageCreateInfo viewUsage; + viewUsage.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO; viewUsage.pNext = nullptr; viewUsage.usage = m_info.usage;