mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 02:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D8/D3D9) Move static global to struct

Browse Source
This commit is contained in:
twinaphex 2020-03-07 17:04:06 +01:00
parent d63daacdf9
commit 3e35fb8672
4 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/common/d3d8_common.h
View File

@ -37,6 +37,9 @@ typedef struct d3d8_video
/* TODO - refactor this away properly. */
bool resolution_hd_enable;
/* Only used for Xbox */
bool widescreen_mode;
unsigned cur_mon_id;
unsigned dev_rotation;

3
gfx/common/d3d9_common.h
View File

@ -68,6 +68,9 @@ typedef struct d3d9_video
/* TODO - refactor this away properly. */
bool resolution_hd_enable;
/* Only used for Xbox */
bool widescreen_mode;
unsigned cur_mon_id;
unsigned dev_rotation;

23
gfx/drivers/d3d8.c
View File

@ -65,10 +65,6 @@
static LPDIRECT3D8 g_pD3D8;
#ifdef _XBOX
static bool d3d8_widescreen_mode = false;
#endif
void *dinput;
typedef struct d3d8_renderchain
@ -592,7 +588,8 @@ static void d3d8_get_video_size(d3d8_video_t *d3d,
*width = 640;
*height = 480;
d3d8_widescreen_mode = false;
d3d->widescreen_mode = false;
/* Only valid in PAL mode, not valid for HDTV modes! */
@ -602,12 +599,12 @@ static void d3d8_get_video_size(d3d8_video_t *d3d,
if(video_mode & XC_VIDEO_FLAGS_WIDESCREEN)
{
*width = 720;
//60 Hz, 720x480i
/* 60 Hz, 720x480i */
if(video_mode & XC_VIDEO_FLAGS_PAL_60Hz)
*height = 480;
else //50 Hz, 720x576i
else /* 50 Hz, 720x576i */
*height = 576;
d3d8_widescreen_mode = true;
d3d->widescreen_mode = true;
}
}
else
@ -617,7 +614,7 @@ static void d3d8_get_video_size(d3d8_video_t *d3d,
{
*width = 720;
*height = 480;
d3d8_widescreen_mode = true;
d3d->widescreen_mode = true;
}
}
@ -627,21 +624,21 @@ static void d3d8_get_video_size(d3d8_video_t *d3d,
{
*width = 640;
*height = 480;
d3d8_widescreen_mode = false;
d3d->widescreen_mode = false;
d3d->resolution_hd_enable = true;
}
else if(video_mode & XC_VIDEO_FLAGS_HDTV_720p)
{
*width = 1280;
*height = 720;
d3d8_widescreen_mode = true;
d3d->widescreen_mode = true;
d3d->resolution_hd_enable = true;
}
else if(video_mode & XC_VIDEO_FLAGS_HDTV_1080i)
{
*width = 1920;
*height = 1080;
d3d8_widescreen_mode = true;
d3d->widescreen_mode = true;
d3d->resolution_hd_enable = true;
}
}
@ -741,7 +738,7 @@ static void d3d8_make_d3dpp(void *data,
}
#if 0
if (d3d8_widescreen_mode)
if (d3d->widescreen_mode)
d3dpp->Flags |= D3DPRESENTFLAG_WIDESCREEN;
#endif
}

30
gfx/drivers/d3d9.c
View File

@ -76,17 +76,14 @@
/* Temporary workaround for d3d9 not being able to poll flags during init */
static gfx_ctx_driver_t d3d9_fake_context;
static uint32_t d3d9_get_flags(void *data);
static bool d3d9_set_shader(void *data, enum rarch_shader_type type, const char *path);
static bool d3d9_set_shader(void *data,
enum rarch_shader_type type, const char *path);
static LPDIRECT3D9 g_pD3D9;
static enum rarch_shader_type supported_shader_type = RARCH_SHADER_NONE;
void *dinput;
#ifdef _XBOX
static bool d3d9_widescreen_mode = false;
#endif
static bool d3d9_set_resize(d3d9_video_t *d3d,
unsigned new_width, unsigned new_height)
{
@ -642,7 +639,7 @@ static void d3d9_get_video_size(d3d9_video_t *d3d,
*height = 480;
}
d3d9_widescreen_mode = video_mode.fIsWideScreen;
d3d->widescreen_mode = video_mode.fIsWideScreen;
}
#endif
@ -721,7 +718,7 @@ void d3d9_make_d3dpp(void *data,
#ifdef _XBOX
d3dpp->MultiSampleType = D3DMULTISAMPLE_NONE;
d3dpp->EnableAutoDepthStencil = FALSE;
if (!d3d9_widescreen_mode)
if (!d3d->widescreen_mode)
d3dpp->Flags |= D3DPRESENTFLAG_NO_LETTERBOX;
d3dpp->MultiSampleQuality = 0;
#endif
@ -1218,22 +1215,19 @@ static bool d3d9_init_internal(d3d9_video_t *d3d,
if (!d3d9_initialize(d3d, &d3d->video_info))
return false;
{
d3d9_fake_context.get_flags = d3d9_get_flags;
d3d9_fake_context.get_flags = d3d9_get_flags;
#ifndef _XBOX_
d3d9_fake_context.get_metrics = win32_get_metrics;
d3d9_fake_context.get_metrics = win32_get_metrics;
#endif
video_context_driver_set(&d3d9_fake_context);
video_context_driver_set(&d3d9_fake_context);
#if defined(HAVE_CG) || defined(HAVE_HLSL)
{
const char *shader_preset = retroarch_get_shader_preset();
enum rarch_shader_type type = video_shader_parse_type(shader_preset);
{
const char *shader_preset = retroarch_get_shader_preset();
enum rarch_shader_type type = video_shader_parse_type(shader_preset);
d3d9_set_shader(d3d, type, shader_preset);
}
#endif
d3d9_set_shader(d3d, type, shader_preset);
}
#endif
d3d_input_driver(settings->arrays.input_joypad_driver,
settings->arrays.input_joypad_driver, input, input_data);