mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12552 from stenzek/fix-d3d11-again

Browse Source 
(d3d11) Fix non-vsynced output without flip, black screens in fullscreen
This commit is contained in:
Autechre 2021-06-22 13:40:01 +02:00 committed by GitHub
commit 23b810b820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/drivers/d3d11.c
View File

@ -766,8 +766,19 @@ static bool d3d11_init_swapchain(d3d11_video_t* d3d11,
&desc, (IDXGISwapChain**)&d3d11->swapChain))) &desc, (IDXGISwapChain**)&d3d11->swapChain)))
return false; return false;
} }
#ifdef HAVE_WINDOW
/* Don't let DXGI mess with the full screen state, because otherwise we end up with a mismatch
* between the window size and the buffers. RetroArch only uses windowed mode (see above). */
if (FAILED(dxgiFactory->lpVtbl->MakeWindowAssociation(dxgiFactory, desc.OutputWindow,
DXGI_MWA_NO_ALT_ENTER)))
{
RARCH_ERR("[D3D11]: Failed to make disable DXGI ALT+ENTER handling.\n");
}
#endif #endif
#endif // __WINRT__
dxgiFactory->lpVtbl->Release(dxgiFactory); dxgiFactory->lpVtbl->Release(dxgiFactory);
adapter->lpVtbl->Release(adapter); adapter->lpVtbl->Release(adapter);
dxgiDevice->lpVtbl->Release(dxgiDevice); dxgiDevice->lpVtbl->Release(dxgiDevice);
@ -1359,8 +1370,7 @@ static bool d3d11_gfx_frame(
d3d11_video_t* d3d11 = (d3d11_video_t*)data; d3d11_video_t* d3d11 = (d3d11_video_t*)data;
D3D11DeviceContext context = d3d11->context; D3D11DeviceContext context = d3d11->context;
bool vsync = d3d11->vsync; bool vsync = d3d11->vsync;
/* TODO/FIXME - setting the conditional to (vsync || !d3d11->has_allow_tearing) causes a black screen on startup in fullscreen mode */ unsigned present_flags = (vsync || !d3d11->has_allow_tearing) ? 0 : DXGI_PRESENT_ALLOW_TEARING;
unsigned present_flags = (vsync) ? 0 : DXGI_PRESENT_ALLOW_TEARING;
const char *stat_text = video_info->stat_text; const char *stat_text = video_info->stat_text;
unsigned video_width = video_info->width; unsigned video_width = video_info->width;
unsigned video_height = video_info->height; unsigned video_height = video_info->height;
@ -1600,10 +1610,9 @@ static bool d3d11_gfx_frame(
D3D11SetPShaderSamplers( D3D11SetPShaderSamplers(
context, 0, 1, &d3d11->samplers[RARCH_FILTER_UNSPEC][RARCH_WRAP_DEFAULT]); context, 0, 1, &d3d11->samplers[RARCH_FILTER_UNSPEC][RARCH_WRAP_DEFAULT]);
D3D11SetVShaderConstantBuffers(context, 0, 1, &d3d11->frame.ubo); D3D11SetVShaderConstantBuffers(context, 0, 1, &d3d11->frame.ubo);
D3D11Draw(context, 4, 0);
} }
D3D11Draw(context, 4, 0);
D3D11SetRasterizerState(context, d3d11->scissor_enabled); D3D11SetRasterizerState(context, d3d11->scissor_enabled);
D3D11SetScissorRects(d3d11->context, 1, &d3d11->scissor); D3D11SetScissorRects(d3d11->context, 1, &d3d11->scissor);
D3D11SetBlendState(context, d3d11->blend_enable, NULL, D3D11_DEFAULT_SAMPLE_MASK); D3D11SetBlendState(context, d3d11->blend_enable, NULL, D3D11_DEFAULT_SAMPLE_MASK);

2
gfx/gfx_display.c
View File

@ -1055,6 +1055,8 @@ void gfx_display_draw_cursor(
draw.texture = texture; draw.texture = texture;
draw.prim_type = GFX_DISPLAY_PRIM_TRIANGLESTRIP; draw.prim_type = GFX_DISPLAY_PRIM_TRIANGLESTRIP;
draw.pipeline_id = 0; draw.pipeline_id = 0;
draw.scale_factor = 1.0f;
draw.rotation = 0.0f;
if (dispctx->blend_begin) if (dispctx->blend_begin)
dispctx->blend_begin(userdata); dispctx->blend_begin(userdata);