rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-15 07:29:17 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Don't enable VK_KHR_maintenance1, VK_KHR_maintenance2

Browse Source 
Core in Vulkan 1.1.
This commit is contained in:
Philip Rebohle 2020-01-16 20:13:06 +01:00 committed by Philip Rebohle
parent 60145f0167
commit 073669b7e7
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d3d11/d3d11_texture.cpp
View File

@ -114,7 +114,7 @@ namespace dxvk {
if (Dimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D && if (Dimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D &&
(m_desc.BindFlags & D3D11_BIND_RENDER_TARGET)) (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 // Some image formats (i.e. the R32G32B32 ones) are
// only supported with linear tiling on most GPUs // only supported with linear tiling on most GPUs

4
src/dxvk/dxvk_adapter.cpp
View File

@ -241,7 +241,7 @@ namespace dxvk {
DxvkDeviceFeatures enabledFeatures) { DxvkDeviceFeatures enabledFeatures) {
DxvkDeviceExtensions devExtensions; DxvkDeviceExtensions devExtensions;
std::array<DxvkExt*, 24> devExtensionList = {{ std::array<DxvkExt*, 22> devExtensionList = {{
&devExtensions.amdMemoryOverallocationBehaviour, &devExtensions.amdMemoryOverallocationBehaviour,
&devExtensions.amdShaderFragmentMask, &devExtensions.amdShaderFragmentMask,
&devExtensions.extConditionalRendering, &devExtensions.extConditionalRendering,
@ -261,8 +261,6 @@ namespace dxvk {
&devExtensions.khrDrawIndirectCount, &devExtensions.khrDrawIndirectCount,
&devExtensions.khrDriverProperties, &devExtensions.khrDriverProperties,
&devExtensions.khrImageFormatList, &devExtensions.khrImageFormatList,
&devExtensions.khrMaintenance1,
&devExtensions.khrMaintenance2,
&devExtensions.khrSamplerMirrorClampToEdge, &devExtensions.khrSamplerMirrorClampToEdge,
&devExtensions.khrShaderDrawParameters, &devExtensions.khrShaderDrawParameters,
&devExtensions.khrSwapchain, &devExtensions.khrSwapchain,

2
src/dxvk/dxvk_context.cpp
View File

@ -274,7 +274,7 @@ namespace dxvk {
bool canUseFb = (srcImage->info().usage & VK_IMAGE_USAGE_SAMPLED_BIT) bool canUseFb = (srcImage->info().usage & VK_IMAGE_USAGE_SAMPLED_BIT)
&& (dstImage->info().usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_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)); || (dstImage->info().type != VK_IMAGE_TYPE_3D));
bool useFb = dstImage->info().sampleCount != VK_SAMPLE_COUNT_1_BIT bool useFb = dstImage->info().sampleCount != VK_SAMPLE_COUNT_1_BIT

2
src/dxvk/dxvk_extensions.h
View File

@ -277,8 +277,6 @@ namespace dxvk {
DxvkExt khrDrawIndirectCount = { VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrDrawIndirectCount = { VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrDriverProperties = { VK_KHR_DRIVER_PROPERTIES_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 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 khrSamplerMirrorClampToEdge = { VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrShaderDrawParameters = { VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, DxvkExtMode::Required }; DxvkExt khrShaderDrawParameters = { VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, DxvkExtMode::Required };
DxvkExt khrSwapchain = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, DxvkExtMode::Required }; DxvkExt khrSwapchain = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, DxvkExtMode::Required };

6
src/dxvk/dxvk_image.cpp
View File

@ -217,7 +217,7 @@ namespace dxvk {
case VK_IMAGE_VIEW_TYPE_3D: { case VK_IMAGE_VIEW_TYPE_3D: {
this->createView(VK_IMAGE_VIEW_TYPE_3D, 1); 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, 1);
this->createView(VK_IMAGE_VIEW_TYPE_2D_ARRAY, m_image->mipLevelExtent(m_info.minLevel).depth); 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.baseArrayLayer = m_info.minLayer;
subresourceRange.layerCount = numLayers; subresourceRange.layerCount = numLayers;
VkImageViewUsageCreateInfoKHR viewUsage; VkImageViewUsageCreateInfo viewUsage;
viewUsage.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR; viewUsage.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO;
viewUsage.pNext = nullptr; viewUsage.pNext = nullptr;
viewUsage.usage = m_info.usage; viewUsage.usage = m_info.usage;