diff --git a/src/d3d11/d3d11_options.cpp b/src/d3d11/d3d11_options.cpp index ace09199..45072c1d 100644 --- a/src/d3d11/d3d11_options.cpp +++ b/src/d3d11/d3d11_options.cpp @@ -13,7 +13,7 @@ namespace dxvk { this->deferSurfaceCreation = config.getOption("dxgi.deferSurfaceCreation", false); this->numBackBuffers = config.getOption("dxgi.numBackBuffers", 0); this->syncInterval = config.getOption("dxgi.syncInterval", -1); - this->syncMode = DxgiSyncMode(config.getOption("dxgi.syncMode", 0)); + this->syncMode = D3D11SwapChainSyncMode(config.getOption("dxgi.syncMode", 0)); } } \ No newline at end of file diff --git a/src/d3d11/d3d11_options.h b/src/d3d11/d3d11_options.h index 36e4dec5..58a59a51 100644 --- a/src/d3d11/d3d11_options.h +++ b/src/d3d11/d3d11_options.h @@ -8,6 +8,14 @@ namespace dxvk { + /** + * \brief Sync mode + */ + enum class D3D11SwapChainSyncMode : int32_t { + Default = 0, + Mailbox = 1, + }; + struct D3D11Options { D3D11Options(const Config& config); /// Handle D3D11_MAP_FLAG_DO_NOT_WAIT properly. @@ -60,7 +68,7 @@ namespace dxvk { bool deferSurfaceCreation; /// Vsync mode - DxgiSyncMode syncMode; + D3D11SwapChainSyncMode syncMode; }; } \ No newline at end of file diff --git a/src/d3d11/d3d11_swapchain.cpp b/src/d3d11/d3d11_swapchain.cpp index 39da8d43..042c222d 100644 --- a/src/d3d11/d3d11_swapchain.cpp +++ b/src/d3d11/d3d11_swapchain.cpp @@ -625,7 +625,7 @@ namespace dxvk { size_t n = 0; if (m_vsync) { - if (options->syncMode == DxgiSyncMode::Mailbox) + if (options->syncMode == D3D11SwapChainSyncMode::Mailbox) modes[n++] = VK_PRESENT_MODE_MAILBOX_KHR; modes[n++] = VK_PRESENT_MODE_FIFO_KHR; } else { diff --git a/src/dxgi/dxgi_options.cpp b/src/dxgi/dxgi_options.cpp index 22e1173c..c1ce8686 100644 --- a/src/dxgi/dxgi_options.cpp +++ b/src/dxgi/dxgi_options.cpp @@ -39,10 +39,6 @@ namespace dxvk { this->maxDeviceMemory = VkDeviceSize(config.getOption("dxgi.maxDeviceMemory", 0)) << 20; this->maxSharedMemory = VkDeviceSize(config.getOption("dxgi.maxSharedMemory", 0)) << 20; - this->numBackBuffers = config.getOption("dxgi.numBackBuffers", 0); - this->syncInterval = config.getOption("dxgi.syncInterval", -1); - this->syncMode = DxgiSyncMode(config.getOption("dxgi.syncMode", 0)); - this->d3d10Enable = config.getOption("d3d10.enable", true); } diff --git a/src/dxgi/dxgi_options.h b/src/dxgi/dxgi_options.h index e661ad26..96bc5a64 100644 --- a/src/dxgi/dxgi_options.h +++ b/src/dxgi/dxgi_options.h @@ -8,14 +8,6 @@ namespace dxvk { - /** - * \brief Sync mode - */ - enum class DxgiSyncMode : int32_t { - Default = 0, - Mailbox = 1, - }; - /** * \brief DXGI options * @@ -46,17 +38,6 @@ namespace dxvk { VkDeviceSize maxDeviceMemory; VkDeviceSize maxSharedMemory; - /// Back buffer count for the Vulkan swap chain. - /// Overrides DXGI_SWAP_CHAIN_DESC::BufferCount. - int32_t numBackBuffers; - - /// Sync interval. Overrides the value - /// passed to IDXGISwapChain::Present. - int32_t syncInterval; - - /// Vsync mode - DxgiSyncMode syncMode; - /// Enables D3D10 support bool d3d10Enable; };