quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix com_maxfps for dx12 backend

Browse Source
This commit is contained in:
Artem Kharytoniuk 2021-06-16 23:10:13 +02:00
parent 90b266515e
commit 765f665164
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/engine/renderer/dx.cpp
View File

@ -7,7 +7,7 @@
#ifdef ENABLE_DX12 #ifdef ENABLE_DX12
#include "D3d12.h" #include "D3d12.h"
#include "DXGI1_4.h" #include "DXGI1_5.h"
#pragma comment (lib, "D3d12.lib") #pragma comment (lib, "D3d12.lib")
#pragma comment (lib, "DXGI.lib") #pragma comment (lib, "DXGI.lib")
@ -128,7 +128,7 @@ void dx_initialize() {
} }
#endif #endif
IDXGIFactory4* factory; IDXGIFactory5* factory;
DX_CHECK(CreateDXGIFactory1(IID_PPV_ARGS(&factory))); DX_CHECK(CreateDXGIFactory1(IID_PPV_ARGS(&factory)));
// Create device. // Create device.
@ -151,6 +151,8 @@ void dx_initialize() {
// Create swap chain. // Create swap chain.
// //
{ {
DX_CHECK(factory->CheckFeatureSupport(DXGI_FEATURE_PRESENT_ALLOW_TEARING, &dx.present_allow_tearing, sizeof(dx.present_allow_tearing)));
DXGI_SWAP_CHAIN_DESC1 swap_chain_desc{}; DXGI_SWAP_CHAIN_DESC1 swap_chain_desc{};
swap_chain_desc.BufferCount = SWAPCHAIN_BUFFER_COUNT; swap_chain_desc.BufferCount = SWAPCHAIN_BUFFER_COUNT;
swap_chain_desc.Width = glConfig.vidWidth; swap_chain_desc.Width = glConfig.vidWidth;
@ -159,6 +161,7 @@ void dx_initialize() {
swap_chain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swap_chain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
swap_chain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; swap_chain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
swap_chain_desc.SampleDesc.Count = 1; swap_chain_desc.SampleDesc.Count = 1;
swap_chain_desc.Flags = dx.present_allow_tearing ? DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING : 0;
IDXGISwapChain1* swapchain; IDXGISwapChain1* swapchain;
DX_CHECK(factory->CreateSwapChainForHwnd( DX_CHECK(factory->CreateSwapChainForHwnd(
@ -1479,7 +1482,7 @@ void dx_end_frame() {
dx.fence_value++; dx.fence_value++;
DX_CHECK(dx.command_queue->Signal(dx.fence, dx.fence_value)); DX_CHECK(dx.command_queue->Signal(dx.fence, dx.fence_value));
DX_CHECK(dx.swapchain->Present(0, 0)); DX_CHECK(dx.swapchain->Present(0, dx.present_allow_tearing ? DXGI_PRESENT_ALLOW_TEARING : 0));
} }
#else // ENABLE_DX12 #else // ENABLE_DX12

1
src/engine/renderer/dx.h
View File

@ -69,6 +69,7 @@ struct Dx_Instance {
ID3D12Device* device = nullptr; ID3D12Device* device = nullptr;
ID3D12CommandQueue* command_queue = nullptr; ID3D12CommandQueue* command_queue = nullptr;
IDXGISwapChain3* swapchain = nullptr; IDXGISwapChain3* swapchain = nullptr;
BOOL present_allow_tearing = false;
UINT frame_index = 0; UINT frame_index = 0;
ID3D12CommandAllocator* command_allocator = nullptr; ID3D12CommandAllocator* command_allocator = nullptr;