This commit is contained in:
twinaphex 2018-01-07 11:06:27 +01:00
parent 88d1e455e3
commit 3ab8f017d9

View File

@ -436,7 +436,6 @@ static void d3d_overlay_render(d3d_video_t *d3d,
d3d_set_stream_source(d3d->dev, 0, overlay->vert_buf,
0, sizeof(*vert));
if (overlay->fullscreen)
{
D3DVIEWPORT vp_full;
@ -532,9 +531,10 @@ static bool d3d_is_windowed_enable(bool info_fullscreen)
{
#ifndef _XBOX
settings_t *settings = config_get_ptr();
if (!info_fullscreen)
return true;
if (settings)
return ((settings->bools.video_windowed_fullscreen)
|| !info_fullscreen);
return settings->bools.video_windowed_fullscreen;
#endif
return false;
}
@ -546,7 +546,8 @@ void d3d_make_d3dpp(void *data,
#ifdef _XBOX360
/* TODO/FIXME - get rid of global state dependencies. */
global_t *global = global_get_ptr();
bool gamma_enable = global ? global->console.screen.gamma_correction : false;
bool gamma_enable = global ?
global->console.screen.gamma_correction : false;
#endif
bool windowed_enable = d3d_is_windowed_enable(info->fullscreen);
@ -558,6 +559,7 @@ void d3d_make_d3dpp(void *data,
if (info->vsync)
{
settings_t *settings = config_get_ptr();
switch (settings->uints.video_swap_interval)
{
default:
@ -584,7 +586,8 @@ void d3d_make_d3dpp(void *data,
d3dpp->SwapEffect = D3DSWAPEFFECT_DISCARD;
d3dpp->BackBufferCount = 2;
d3dpp->BackBufferFormat = d3d_get_color_format_backbuffer(info->rgb32, windowed_enable);
d3dpp->BackBufferFormat = d3d_get_color_format_backbuffer(
info->rgb32, windowed_enable);
#ifndef _XBOX
d3dpp->hDeviceWindow = win32_get_window();
#endif
@ -594,8 +597,10 @@ void d3d_make_d3dpp(void *data,
if (gamma_enable)
{
d3dpp->BackBufferFormat = (D3DFORMAT)MAKESRGBFMT(d3dpp->BackBufferFormat);
d3dpp->FrontBufferFormat= (D3DFORMAT)MAKESRGBFMT(d3dpp->FrontBufferFormat);
d3dpp->BackBufferFormat = (D3DFORMAT)MAKESRGBFMT(
d3dpp->BackBufferFormat);
d3dpp->FrontBufferFormat = (D3DFORMAT)MAKESRGBFMT(
d3dpp->FrontBufferFormat);
}
#endif