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

Add GFX_CTL_HAS_WINDOWED

Browse Source
This commit is contained in:
twinaphex 2016-02-13 08:37:10 +01:00
parent 752e9abd4e
commit f079ca29e4
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/d3d/d3d.cpp
View File

@ -881,7 +881,7 @@ static bool d3d_suppress_screensaver(void *data, bool enable)
static bool d3d_has_windowed(void *data) static bool d3d_has_windowed(void *data)
{ {
return gfx_ctx_has_windowed(); return gfx_ctx_ctl(GFX_CTL_HAS_WINDOWED, NULL);
} }
static void d3d_set_aspect_ratio(void *data, unsigned aspect_ratio_idx) static void d3d_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)

2
gfx/drivers/gl.c
View File

@ -2716,7 +2716,7 @@ static bool gl_suppress_screensaver(void *data, bool enable)
static bool gl_has_windowed(void *data) static bool gl_has_windowed(void *data)
{ {
return gfx_ctx_has_windowed(); return gfx_ctx_ctl(GFX_CTL_HAS_WINDOWED, NULL);
} }
static void gl_update_tex_filter_frame(gl_t *gl) static void gl_update_tex_filter_frame(gl_t *gl)

2
gfx/drivers/vg.c
View File

@ -389,7 +389,7 @@ static bool vg_suppress_screensaver(void *data, bool enable)
static bool vg_has_windowed(void *data) static bool vg_has_windowed(void *data)
{ {
return gfx_ctx_has_windowed(); return gfx_ctx_ctl(GFX_CTL_HAS_WINDOWED, NULL);
} }
static bool vg_set_shader(void *data, static bool vg_set_shader(void *data,

11
gfx/video_context_driver.c
View File

@ -200,13 +200,6 @@ void gfx_ctx_show_mouse(bool state)
current_video_context->show_mouse(video_context_data, state); current_video_context->show_mouse(video_context_data, state);
} }
bool gfx_ctx_has_windowed(void)
{
if (!video_context_data)
return false;
return current_video_context->has_windowed(video_context_data);
}
bool gfx_ctx_check_window(bool *quit, bool *resize, bool gfx_ctx_check_window(bool *quit, bool *resize,
unsigned *width, unsigned *height) unsigned *width, unsigned *height)
{ {
@ -434,6 +427,10 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data)
if (!video_context_data || !current_video_context->has_focus) if (!video_context_data || !current_video_context->has_focus)
return false; return false;
return current_video_context->has_focus(video_context_data); return current_video_context->has_focus(video_context_data);
case GFX_CTL_HAS_WINDOWED:
if (!video_context_data)
return false;
return current_video_context->has_windowed(video_context_data);
case GFX_CTL_FREE: case GFX_CTL_FREE:
if (current_video_context->destroy) if (current_video_context->destroy)
current_video_context->destroy(video_context_data); current_video_context->destroy(video_context_data);

5
gfx/video_context_driver.h
View File

@ -56,7 +56,8 @@ enum gfx_ctx_ctl_state
GFX_CTL_NONE = 0, GFX_CTL_NONE = 0,
GFX_CTL_FOCUS, GFX_CTL_FOCUS,
GFX_CTL_FREE, GFX_CTL_FREE,
GFX_CTL_SWAP_BUFFERS GFX_CTL_SWAP_BUFFERS,
GFX_CTL_HAS_WINDOWED
}; };
typedef void (*gfx_ctx_proc_t)(void); typedef void (*gfx_ctx_proc_t)(void);
@ -222,8 +223,6 @@ bool gfx_ctx_image_buffer_write(const void *frame,
void gfx_ctx_show_mouse(bool state); void gfx_ctx_show_mouse(bool state);
bool gfx_ctx_has_windowed(void);
bool gfx_ctx_check_window(bool *quit, bool *resize, bool gfx_ctx_check_window(bool *quit, bool *resize,
unsigned *width, unsigned *height); unsigned *width, unsigned *height);