MoonsideGames
/
Refresh
1
0
Fork 1
Code Issues 1 Pull Requests 2 Projects Releases 33 Wiki Activity

PresentMode fixes
continuous-integration/drone/pr Build is failing Details

pull/47/head
Caleb Cornett 2024-02-10 18:00:12 -06:00
parent 91b389f351
commit 54ffdc180d
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Refresh_Driver_D3D11.c
View File

@ -519,6 +519,7 @@ typedef struct D3D11Renderer
uint8_t debugMode; uint8_t debugMode;
BOOL supportsTearing; BOOL supportsTearing;
uint8_t supportsFlipDiscard;
PFN_D3DCOMPILE D3DCompileFunc; PFN_D3DCOMPILE D3DCompileFunc;
@ -3305,7 +3306,6 @@ static uint8_t D3D11_INTERNAL_CreateSwapchain(
HWND dxgiHandle; HWND dxgiHandle;
int width, height; int width, height;
DXGI_SWAP_CHAIN_DESC swapchainDesc; DXGI_SWAP_CHAIN_DESC swapchainDesc;
IDXGIFactory4 *factory4;
IDXGIFactory1 *pParent; IDXGIFactory1 *pParent;
IDXGISwapChain *swapchain; IDXGISwapChain *swapchain;
D3D11SwapchainData *swapchainData; D3D11SwapchainData *swapchainData;
@ -3339,27 +3339,17 @@ static uint8_t D3D11_INTERNAL_CreateSwapchain(
if (renderer->supportsTearing) if (renderer->supportsTearing)
{ {
swapchainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING; swapchainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING;
/* We know this is supported because tearing support implies DXGI 1.5+ */
swapchainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; swapchainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
} }
else else
{ {
swapchainDesc.Flags = 0; swapchainDesc.Flags = 0;
swapchainDesc.SwapEffect = (
/* For Windows 10+, use a better form of discard swap behavior */ renderer->supportsFlipDiscard ?
res = IDXGIFactory1_QueryInterface( DXGI_SWAP_EFFECT_FLIP_DISCARD :
renderer->factory, DXGI_SWAP_EFFECT_DISCARD
&D3D_IID_IDXGIFactory4,
&factory4
); );
if (SUCCEEDED(res))
{
swapchainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
IDXGIFactory4_Release(factory4);
}
else
{
swapchainDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
}
} }
/* Create the swapchain! */ /* Create the swapchain! */
@ -3369,7 +3359,7 @@ static uint8_t D3D11_INTERNAL_CreateSwapchain(
&swapchainDesc, &swapchainDesc,
&swapchain &swapchain
); );
ERROR_CHECK("Could not create swapchain", 0); ERROR_CHECK_RETURN("Could not create swapchain", 0);
/* /*
* The swapchain's parent is a separate factory from the factory that * The swapchain's parent is a separate factory from the factory that
@ -3783,17 +3773,18 @@ static void D3D11_Submit(
/* Present, if applicable */ /* Present, if applicable */
if (d3d11CommandBuffer->swapchainData) if (d3d11CommandBuffer->swapchainData)
{ {
/* FIXME: Is there some way to emulate FIFO_RELAXED? */
uint32_t syncInterval = 1; uint32_t syncInterval = 1;
if (d3d11CommandBuffer->swapchainData->presentMode == REFRESH_PRESENTMODE_IMMEDIATE) if ( d3d11CommandBuffer->swapchainData->presentMode == REFRESH_PRESENTMODE_IMMEDIATE ||
{ (renderer->supportsFlipDiscard && d3d11CommandBuffer->swapchainData->presentMode == REFRESH_PRESENTMODE_MAILBOX)
) {
syncInterval = 0; syncInterval = 0;
} }
uint32_t presentFlags = 0; uint32_t presentFlags = 0;
if ( renderer->supportsTearing && if (renderer->supportsTearing && d3d11CommandBuffer->swapchainData->presentMode == REFRESH_PRESENTMODE_IMMEDIATE)
(d3d11CommandBuffer->swapchainData->presentMode == REFRESH_PRESENTMODE_IMMEDIATE || {
d3d11CommandBuffer->swapchainData->presentMode == REFRESH_PRESENTMODE_FIFO_RELAXED)
) {
presentFlags = DXGI_PRESENT_ALLOW_TEARING; presentFlags = DXGI_PRESENT_ALLOW_TEARING;
} }
@ -4084,6 +4075,7 @@ static Refresh_Device* D3D11_CreateDevice(
PFN_CREATE_DXGI_FACTORY1 CreateDXGIFactoryFunc; PFN_CREATE_DXGI_FACTORY1 CreateDXGIFactoryFunc;
PFN_D3D11_CREATE_DEVICE D3D11CreateDeviceFunc; PFN_D3D11_CREATE_DEVICE D3D11CreateDeviceFunc;
D3D_FEATURE_LEVEL levels[] = { D3D_FEATURE_LEVEL_11_1 }; D3D_FEATURE_LEVEL levels[] = { D3D_FEATURE_LEVEL_11_1 };
IDXGIFactory4 *factory4;
IDXGIFactory5 *factory5; IDXGIFactory5 *factory5;
IDXGIFactory6 *factory6; IDXGIFactory6 *factory6;
uint32_t flags; uint32_t flags;
@ -4139,6 +4131,18 @@ static Refresh_Device* D3D11_CreateDevice(
); );
ERROR_CHECK_RETURN("Could not create DXGIFactory", NULL); ERROR_CHECK_RETURN("Could not create DXGIFactory", NULL);
/* Check for flip-model discard support (supported on Windows 10+) */
res = IDXGIFactory1_QueryInterface(
renderer->factory,
&D3D_IID_IDXGIFactory4,
&factory4
);
if (SUCCEEDED(res))
{
renderer->supportsFlipDiscard = 1;
IDXGIFactory4_Release(factory4);
}
/* Check for explicit tearing support */ /* Check for explicit tearing support */
res = IDXGIFactory1_QueryInterface( res = IDXGIFactory1_QueryInterface(
renderer->factory, renderer->factory,