From 5ae3cfe40200cb716ea78a2b02b8b4a11b1b3432 Mon Sep 17 00:00:00 2001 From: WinterSnowfall Date: Thu, 4 Jul 2024 11:24:25 +0300 Subject: [PATCH] [d3d9] Fix DF Formats selection logic --- src/d3d9/d3d9_format.cpp | 3 ++- src/d3d9/d3d9_options.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/d3d9/d3d9_format.cpp b/src/d3d9/d3d9_format.cpp index 63a00d522..92069d60a 100644 --- a/src/d3d9/d3d9_format.cpp +++ b/src/d3d9/d3d9_format.cpp @@ -442,7 +442,8 @@ namespace dxvk { const auto& props = adapter->deviceProperties(); uint32_t vendorId = options.customVendorId == -1 ? props.vendorID : uint32_t(options.customVendorId); - m_dfSupport = options.supportDFFormats; + // NVIDIA does not natively support any DF formats + m_dfSupport = vendorId == uint32_t(DxvkGpuVendor::Nvidia) ? false : options.supportDFFormats; m_x4r4g4b4Support = options.supportX4R4G4B4; // Only AMD supports D16_LOCKABLE natively m_d16lockableSupport = vendorId == uint32_t(DxvkGpuVendor::Amd) ? true : options.supportD16Lockable; diff --git a/src/d3d9/d3d9_options.cpp b/src/d3d9/d3d9_options.cpp index 3221c29c8..dbc46a769 100644 --- a/src/d3d9/d3d9_options.cpp +++ b/src/d3d9/d3d9_options.cpp @@ -53,7 +53,7 @@ namespace dxvk { this->deferSurfaceCreation = config.getOption ("d3d9.deferSurfaceCreation", false); this->samplerAnisotropy = config.getOption ("d3d9.samplerAnisotropy", -1); this->maxAvailableMemory = config.getOption ("d3d9.maxAvailableMemory", 4096); - this->supportDFFormats = config.getOption ("d3d9.supportDFFormats", vendorId != uint32_t(DxvkGpuVendor::Nvidia)); + this->supportDFFormats = config.getOption ("d3d9.supportDFFormats", true); this->supportX4R4G4B4 = config.getOption ("d3d9.supportX4R4G4B4", true); this->supportD16Lockable = config.getOption ("d3d9.supportD16Lockable", false); this->useD32forD24 = config.getOption ("d3d9.useD32forD24", false);