(D3D10/11/12) Menu widgets can now appear ingame

This commit is contained in:
twinaphex 2019-04-11 02:21:45 +02:00
parent 2bfb073b3e
commit 702c889cd1
3 changed files with 23 additions and 6 deletions

View File

@ -1403,12 +1403,18 @@ static bool d3d10_gfx_frame(
d3d10->sprites.enabled = true;
#ifdef HAVE_MENU
#ifndef HAVE_MENU_WIDGETS
if (d3d10->menu.enabled)
#endif
{
D3D10SetViewports(context, 1, &d3d10->viewport);
D3D10SetVertexBuffer(context, 0, d3d10->sprites.vbo, sizeof(d3d10_sprite_t), 0);
menu_driver_frame(video_info);
}
#endif
#ifdef HAVE_MENU
if (d3d10->menu.enabled)
menu_driver_frame(video_info);
else
#endif
if (video_info->statistics_show)

View File

@ -1468,12 +1468,19 @@ static bool d3d11_gfx_frame(
d3d11->sprites.enabled = true;
#ifdef HAVE_MENU
#ifndef HAVE_MENU_WIDGETS
if (d3d11->menu.enabled)
#endif
{
D3D11SetViewports(context, 1, &d3d11->viewport);
D3D11SetVertexBuffer(context, 0, d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0);
menu_driver_frame(video_info);
D3D11SetVertexBuffer(context, 0,
d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0);
}
#endif
#ifdef HAVE_MENU
if (d3d11->menu.enabled)
menu_driver_frame(video_info);
else
#endif
if (video_info->statistics_show)
@ -1528,8 +1535,6 @@ static bool d3d11_gfx_frame(
}
d3d11->sprites.enabled = false;
#if 0
PERF_STOP();
#endif

View File

@ -1477,13 +1477,19 @@ static bool d3d12_gfx_frame(
d3d12->sprites.enabled = true;
#ifdef HAVE_MENU
#ifndef HAVE_MENU_WIDGETS
if (d3d12->menu.enabled)
#endif
{
D3D12RSSetViewports(d3d12->queue.cmd, 1, &d3d12->chain.viewport);
D3D12RSSetScissorRects(d3d12->queue.cmd, 1, &d3d12->chain.scissorRect);
D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->sprites.vbo_view);
menu_driver_frame(video_info);
}
#endif
#ifdef HAVE_MENU
if (d3d12->menu.enabled)
menu_driver_frame(video_info);
else
#endif
if (video_info->statistics_show)