diff --git a/README.md b/README.md index 6523a244..846cad15 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ For Direct3D 10 support, check out [DXUP](https://github.com/Joshua-Ashton/dxup) ## Build instructions ### Requirements: -- [wine 3.5](https://www.winehq.org/) or newer +- [wine 3.10](https://www.winehq.org/) or newer - [Meson](http://mesonbuild.com/) build system (at least version 0.43) - [MinGW64](http://mingw-w64.org/) compiler and headers (requires threading support) - [glslang](https://github.com/KhronosGroup/glslang) front end and validator diff --git a/src/dxvk/dxvk_extensions.h b/src/dxvk/dxvk_extensions.h index fd34df35..173c2c3c 100644 --- a/src/dxvk/dxvk_extensions.h +++ b/src/dxvk/dxvk_extensions.h @@ -129,12 +129,12 @@ namespace dxvk { * used by DXVK if supported by the implementation. */ struct DxvkDeviceExtensions : public DxvkExtensionList { - DxvkExtension extVertexAttributeDivisor = { this, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, DxvkExtensionType::Desired }; + DxvkExtension extVertexAttributeDivisor = { this, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, DxvkExtensionType::Required }; DxvkExtension extShaderViewportIndexLayer = { this, VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME, DxvkExtensionType::Desired }; DxvkExtension khrDescriptorUpdateTemplate = { this, VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME, DxvkExtensionType::Required }; DxvkExtension khrSamplerMirrorClampToEdge = { this, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, DxvkExtensionType::Desired }; DxvkExtension khrMaintenance1 = { this, VK_KHR_MAINTENANCE1_EXTENSION_NAME, DxvkExtensionType::Required }; - DxvkExtension khrMaintenance2 = { this, VK_KHR_MAINTENANCE2_EXTENSION_NAME, DxvkExtensionType::Desired }; + DxvkExtension khrMaintenance2 = { this, VK_KHR_MAINTENANCE2_EXTENSION_NAME, DxvkExtensionType::Required }; DxvkExtension khrShaderDrawParameters = { this, VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, DxvkExtensionType::Required }; DxvkExtension khrSwapchain = { this, VK_KHR_SWAPCHAIN_EXTENSION_NAME, DxvkExtensionType::Required }; }; diff --git a/src/dxvk/dxvk_graphics.cpp b/src/dxvk/dxvk_graphics.cpp index ad83ada0..9dc98a16 100644 --- a/src/dxvk/dxvk_graphics.cpp +++ b/src/dxvk/dxvk_graphics.cpp @@ -255,10 +255,6 @@ namespace dxvk { if (viDivisorCount == 0) viInfo.pNext = viDivisorInfo.pNext; - // TODO make this extension required when widely supported - if (!m_device->extensions().extVertexAttributeDivisor.enabled()) - viInfo.pNext = viDivisorInfo.pNext; - VkPipelineInputAssemblyStateCreateInfo iaInfo; iaInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; iaInfo.pNext = nullptr;