From 2b9a03d9bc47879ebc502337d9aa138a68570d9b Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Mon, 28 Mar 2022 20:04:29 +0200 Subject: [PATCH] Post-merge fixes --- Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp | 1 - .../Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp index aadac4abf..a4d0471c8 100644 --- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp +++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp @@ -276,7 +276,6 @@ bool GPUDeviceDX11::Init() factory5->Release(); } - // Get flags and device type base on current configuration uint32 flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT; #if GPU_ENABLE_DIAGNOSTICS diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp index c7b884c59..407f4f4d5 100644 --- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp +++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp @@ -138,10 +138,12 @@ void GPUSwapChainDX11::Present(bool vsync) // Present frame ASSERT(_swapChain); UINT presentFlags = 0; +#if PLATFORM_WINDOWS if (!vsync && !_isFullscreen && _allowTearing) { presentFlags |= DXGI_PRESENT_ALLOW_TEARING; } +#endif const HRESULT result = _swapChain->Present(vsync ? 1 : 0, presentFlags); LOG_DIRECTX_RESULT(result); @@ -159,7 +161,9 @@ bool GPUSwapChainDX11::Resize(int32 width, int32 height) _device->WaitForGPU(); GPUDeviceLock lock(_device); +#if PLATFORM_WINDOWS _allowTearing = _device->AllowTearing; +#endif _format = GPU_BACK_BUFFER_PIXEL_FORMAT; #if PLATFORM_WINDOWS