Merge pull request #6161 from aliaspider/master

(D3D10/12) frame duping. re-enable vsync.
This commit is contained in:
Twinaphex 2018-01-23 19:18:46 +01:00 committed by GitHub
commit 0b68b46c57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -263,7 +263,7 @@ static bool d3d10_gfx_frame(
} }
} }
DXGIPresent(d3d10->swapChain, !d3d10->vsync, 0); DXGIPresent(d3d10->swapChain, !!d3d10->vsync, 0);
PERF_STOP(); PERF_STOP();
if (msg && *msg) if (msg && *msg)

View File

@ -143,12 +143,13 @@ static bool d3d12_gfx_frame(
d3d12_update_texture(width, height, pitch, d3d12->format, frame, &d3d12->frame.texture); d3d12_update_texture(width, height, pitch, d3d12->format, frame, &d3d12->frame.texture);
d3d12_upload_texture(d3d12->queue.cmd, &d3d12->frame.texture); d3d12_upload_texture(d3d12->queue.cmd, &d3d12->frame.texture);
d3d12_set_texture(d3d12->queue.cmd, &d3d12->frame.texture);
d3d12_set_sampler(d3d12->queue.cmd, d3d12->frame.sampler);
D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->frame.vbo_view);
D3D12DrawInstanced(d3d12->queue.cmd, 4, 1, 0, 0);
} }
d3d12_set_texture(d3d12->queue.cmd, &d3d12->frame.texture);
d3d12_set_sampler(d3d12->queue.cmd, d3d12->frame.sampler);
D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->frame.vbo_view);
D3D12DrawInstanced(d3d12->queue.cmd, 4, 1, 0, 0);
if (d3d12->menu.enabled && d3d12->menu.texture.handle) if (d3d12->menu.enabled && d3d12->menu.texture.handle)
{ {
if (d3d12->menu.texture.dirty) if (d3d12->menu.texture.dirty)
@ -168,8 +169,7 @@ static bool d3d12_gfx_frame(
D3D12ExecuteGraphicsCommandLists(d3d12->queue.handle, 1, &d3d12->queue.cmd); D3D12ExecuteGraphicsCommandLists(d3d12->queue.handle, 1, &d3d12->queue.cmd);
#if 1 #if 1
// DXGIPresent(d3d12->chain.handle, !!d3d12->chain.vsync, 0); DXGIPresent(d3d12->chain.handle, !!d3d12->chain.vsync, 0);
DXGIPresent(d3d12->chain.handle, 0, 0);
#else #else
DXGI_PRESENT_PARAMETERS pp = { 0 }; DXGI_PRESENT_PARAMETERS pp = { 0 };
DXGIPresent1(d3d12->swapchain, 0, 0, &pp); DXGIPresent1(d3d12->swapchain, 0, 0, &pp);