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

Move driver_video_resolve to gfx/video_driver.c

Browse Source
This commit is contained in:
twinaphex 2015-01-12 20:20:58 +01:00
parent 72a7f43736
commit 6b3a67d5ea
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
driver.c
View File

@ -967,25 +967,3 @@ bool driver_monitor_fps_statistics(double *refresh_rate,
return true;
}
/**
* driver_video_resolve:
* @drv : real video driver will be set to this.
*
* Use this if you need the real video driver
* and driver data pointers.
*
* Returns: video driver's userdata.
**/
void *driver_video_resolve(const video_driver_t **drv)
{
#ifdef HAVE_THREADS
if (g_settings.video.threaded
&& !g_extern.system.hw_render_callback.context_type)
return rarch_threaded_video_resolve(drv);
#endif
if (drv)
*drv = driver.video;
return driver.video_data;
}

12
driver.h
View File

@ -445,18 +445,6 @@ bool driver_set_sensor_state(unsigned port,
float driver_sensor_get_input(unsigned port, unsigned action);
/**
* driver_video_resolve:
* @drv : real video driver will be set to this.
*
* Use this if you need the real video driver
* and driver data pointers.
*
* Returns: video driver's userdata.
**/
void *driver_video_resolve(const video_driver_t **drv);
/**
* driver_update_system_av_info:
* @info : pointer to new A/V info

23
gfx/video_driver.c
View File

@ -17,6 +17,7 @@
#include <string.h>
#include <string/string_list.h>
#include "video_driver.h"
#include "video_thread_wrapper.h"
#include "../general.h"
static const video_driver_t *video_drivers[] = {
@ -165,3 +166,25 @@ void find_video_driver(void)
rarch_fail(1, "find_video_driver()");
}
}
/**
* driver_video_resolve:
* @drv : real video driver will be set to this.
*
* Use this if you need the real video driver
* and driver data pointers.
*
* Returns: video driver's userdata.
**/
void *driver_video_resolve(const video_driver_t **drv)
{
#ifdef HAVE_THREADS
if (g_settings.video.threaded
&& !g_extern.system.hw_render_callback.context_type)
return rarch_threaded_video_resolve(drv);
#endif
if (drv)
*drv = driver.video;
return driver.video_data;
}

11
gfx/video_driver.h
View File

@ -213,6 +213,17 @@ const char* config_get_video_driver_options(void);
void find_video_driver(void);
/**
* driver_video_resolve:
* @drv : real video driver will be set to this.
*
* Use this if you need the real video driver
* and driver data pointers.
*
* Returns: video driver's userdata.
**/
void *driver_video_resolve(const video_driver_t **drv);
#ifdef __cplusplus
}
#endif