backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxgi] Remove unused presenter options

Browse Source
This commit is contained in:
Philip Rebohle 2018-10-23 11:09:24 +02:00
parent 3b5b20ca3f
commit 86e6477e80
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
5 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d3d11/d3d11_options.cpp
View File

@ -13,7 +13,7 @@ namespace dxvk {
this->deferSurfaceCreation = config.getOption<bool>("dxgi.deferSurfaceCreation", false); this->deferSurfaceCreation = config.getOption<bool>("dxgi.deferSurfaceCreation", false);
this->numBackBuffers = config.getOption<int32_t>("dxgi.numBackBuffers", 0); this->numBackBuffers = config.getOption<int32_t>("dxgi.numBackBuffers", 0);
this->syncInterval = config.getOption<int32_t>("dxgi.syncInterval", -1); this->syncInterval = config.getOption<int32_t>("dxgi.syncInterval", -1);
this->syncMode = DxgiSyncMode(config.getOption<int32_t>("dxgi.syncMode", 0)); this->syncMode = D3D11SwapChainSyncMode(config.getOption<int32_t>("dxgi.syncMode", 0));
} }
} }

10
src/d3d11/d3d11_options.h
View File

@ -8,6 +8,14 @@
namespace dxvk { namespace dxvk {
/**
* \brief Sync mode
*/
enum class D3D11SwapChainSyncMode : int32_t {
Default = 0,
Mailbox = 1,
};
struct D3D11Options { struct D3D11Options {
D3D11Options(const Config& config); D3D11Options(const Config& config);
/// Handle D3D11_MAP_FLAG_DO_NOT_WAIT properly. /// Handle D3D11_MAP_FLAG_DO_NOT_WAIT properly.
@ -60,7 +68,7 @@ namespace dxvk {
bool deferSurfaceCreation; bool deferSurfaceCreation;
/// Vsync mode /// Vsync mode
DxgiSyncMode syncMode; D3D11SwapChainSyncMode syncMode;
}; };
} }

2
src/d3d11/d3d11_swapchain.cpp
View File

@ -625,7 +625,7 @@ namespace dxvk {
size_t n = 0; size_t n = 0;
if (m_vsync) { 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_MAILBOX_KHR;
modes[n++] = VK_PRESENT_MODE_FIFO_KHR; modes[n++] = VK_PRESENT_MODE_FIFO_KHR;
} else { } else {

4
src/dxgi/dxgi_options.cpp
View File

@ -39,10 +39,6 @@ namespace dxvk {
this->maxDeviceMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxDeviceMemory", 0)) << 20; this->maxDeviceMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxDeviceMemory", 0)) << 20;
this->maxSharedMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxSharedMemory", 0)) << 20; this->maxSharedMemory = VkDeviceSize(config.getOption<int32_t>("dxgi.maxSharedMemory", 0)) << 20;
this->numBackBuffers = config.getOption<int32_t>("dxgi.numBackBuffers", 0);
this->syncInterval = config.getOption<int32_t>("dxgi.syncInterval", -1);
this->syncMode = DxgiSyncMode(config.getOption<int32_t>("dxgi.syncMode", 0));
this->d3d10Enable = config.getOption<bool>("d3d10.enable", true); this->d3d10Enable = config.getOption<bool>("d3d10.enable", true);
} }

19
src/dxgi/dxgi_options.h
View File

@ -8,14 +8,6 @@
namespace dxvk { namespace dxvk {
/**
* \brief Sync mode
*/
enum class DxgiSyncMode : int32_t {
Default = 0,
Mailbox = 1,
};
/** /**
* \brief DXGI options * \brief DXGI options
* *
@ -46,17 +38,6 @@ namespace dxvk {
VkDeviceSize maxDeviceMemory; VkDeviceSize maxDeviceMemory;
VkDeviceSize maxSharedMemory; 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 /// Enables D3D10 support
bool d3d10Enable; bool d3d10Enable;
}; };