Get rid of d3d9_suppress_screensaver in d3d9_common.c
This commit is contained in:
parent
a396cd872c
commit
efe6d14d37
|
@ -1067,15 +1067,6 @@ void d3d9_free_overlay(d3d9_video_t *d3d, overlay_t *overlay)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bool d3d9_suppress_screensaver(void *data, bool enable)
|
|
||||||
{
|
|
||||||
#ifdef _XBOX
|
|
||||||
return true;
|
|
||||||
#else
|
|
||||||
return win32_suppress_screensaver(data, enable);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void d3d9_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
|
void d3d9_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
|
||||||
{
|
{
|
||||||
d3d9_video_t *d3d = (d3d9_video_t*)data;
|
d3d9_video_t *d3d = (d3d9_video_t*)data;
|
||||||
|
|
|
@ -255,8 +255,6 @@ bool d3d9_read_viewport(void *data, uint8_t *buffer, bool is_idle);
|
||||||
|
|
||||||
bool d3d9_has_windowed(void *data);
|
bool d3d9_has_windowed(void *data);
|
||||||
|
|
||||||
bool d3d9_suppress_screensaver(void *data, bool enable);
|
|
||||||
|
|
||||||
bool d3d9_process_shader(d3d9_video_t *d3d);
|
bool d3d9_process_shader(d3d9_video_t *d3d);
|
||||||
|
|
||||||
uintptr_t d3d9_load_texture(void *video_data, void *data,
|
uintptr_t d3d9_load_texture(void *video_data, void *data,
|
||||||
|
|
|
@ -1997,7 +1997,7 @@ video_driver_t video_d3d9_cg = {
|
||||||
d3d9_cg_set_nonblock_state,
|
d3d9_cg_set_nonblock_state,
|
||||||
d3d9_cg_alive,
|
d3d9_cg_alive,
|
||||||
NULL, /* focus */
|
NULL, /* focus */
|
||||||
d3d9_suppress_screensaver,
|
win32_suppress_screensaver,
|
||||||
d3d9_has_windowed,
|
d3d9_has_windowed,
|
||||||
d3d9_cg_set_shader,
|
d3d9_cg_set_shader,
|
||||||
d3d9_cg_free,
|
d3d9_cg_free,
|
||||||
|
|
|
@ -1581,13 +1581,24 @@ static void d3d9_hlsl_set_nonblock_state(void *data, bool state,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef _XBOX
|
||||||
|
static bool d3d9_hlsl_suppress_screensaver(void *data, bool enable)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
video_driver_t video_d3d9_hlsl = {
|
video_driver_t video_d3d9_hlsl = {
|
||||||
d3d9_hlsl_init,
|
d3d9_hlsl_init,
|
||||||
d3d9_hlsl_frame,
|
d3d9_hlsl_frame,
|
||||||
d3d9_hlsl_set_nonblock_state,
|
d3d9_hlsl_set_nonblock_state,
|
||||||
d3d9_hlsl_alive,
|
d3d9_hlsl_alive,
|
||||||
NULL, /* focus */
|
NULL, /* focus */
|
||||||
d3d9_suppress_screensaver,
|
#ifdef _XBOX
|
||||||
|
d3d9_hlsl_suppress_screensaver,
|
||||||
|
#else
|
||||||
|
win32_suppress_screensaver,
|
||||||
|
#endif
|
||||||
d3d9_has_windowed,
|
d3d9_has_windowed,
|
||||||
d3d9_hlsl_set_shader,
|
d3d9_hlsl_set_shader,
|
||||||
d3d9_hlsl_free,
|
d3d9_hlsl_free,
|
||||||
|
|
Loading…
Reference in New Issue