ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add param to video_driver_get_ptr for grabbing the nonthreaded 

data state
This commit is contained in:
twinaphex 2015-11-23 16:06:09 +01:00
parent a9cb970d0d
commit c7dc83533a
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_shader/shader_null.c
View File

@ -54,7 +54,7 @@ static bool shader_null_set_mvp(void *data, const math_matrix_4x4 *mat)
{ {
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#ifndef NO_GL_FF_MATRIX #ifndef NO_GL_FF_MATRIX
gl_t *gl = (gl_t*)video_driver_get_ptr(); gl_t *gl = (gl_t*)video_driver_get_ptr(false);
if (gl) if (gl)
{ {
gl_ff_matrix(mat); gl_ff_matrix(mat);
@ -68,7 +68,7 @@ static bool shader_null_set_coords(const void *data)
{ {
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#ifndef NO_GL_FF_VERTEX #ifndef NO_GL_FF_VERTEX
gl_t *gl = (gl_t*)video_driver_get_ptr(); gl_t *gl = (gl_t*)video_driver_get_ptr(false);
if (gl) if (gl)
{ {
const struct gfx_coords *coords = (const struct gfx_coords*)data; const struct gfx_coords *coords = (const struct gfx_coords*)data;

4
gfx/video_driver.c
View File

@ -265,7 +265,7 @@ video_pixel_scaler_t *scaler_get_ptr(void)
* *
* Returns: video driver's userdata. * Returns: video driver's userdata.
**/ **/
void *video_driver_get_ptr(void) void *video_driver_get_ptr(bool force_nonthreaded_data)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
@ -273,7 +273,7 @@ void *video_driver_get_ptr(void)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (settings->video.threaded if (settings->video.threaded
&& !video_state.hw_render_callback.context_type) && !video_state.hw_render_callback.context_type && !force_nonthreaded_data)
return rarch_threaded_video_get_ptr(NULL); return rarch_threaded_video_get_ptr(NULL);
#endif #endif

2
gfx/video_driver.h
View File

@ -355,7 +355,7 @@ const char* config_get_video_driver_options(void);
* *
* Returns: video driver's userdata. * Returns: video driver's userdata.
**/ **/
void *video_driver_get_ptr(void); void *video_driver_get_ptr(bool force_nonthreaded_data);
/** /**
* video_driver_get_current_framebuffer: * video_driver_get_current_framebuffer:

2
input/input_overlay.c
View File

@ -1051,7 +1051,7 @@ input_overlay_t *input_overlay_new(const char *path, bool enable,
goto error; goto error;
} }
ol->iface_data = video_driver_get_ptr(); ol->iface_data = video_driver_get_ptr(true);
if (!ol->iface) if (!ol->iface)
goto error; goto error;

6
menu/drivers/rmenu_xui.cpp
View File

@ -281,7 +281,7 @@ static void* rmenu_xui_init(void)
if (!menu) if (!menu)
return NULL; return NULL;
d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d = (d3d_video_t*)video_driver_get_ptr(false);
if (d3d->resolution_hd_enable) if (d3d->resolution_hd_enable)
RARCH_LOG("HD menus enabled.\n"); RARCH_LOG("HD menus enabled.\n");
@ -369,7 +369,7 @@ static void xui_render_message(const char *msg)
size_t j = 0; size_t j = 0;
struct string_list *list = NULL; struct string_list *list = NULL;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(false);
if (!d3d) if (!d3d)
return; return;
@ -416,7 +416,7 @@ static void rmenu_xui_frame(void)
if (!menu) if (!menu)
return; return;
d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d = (d3d_video_t*)video_driver_get_ptr(false);
if (!d3d) if (!d3d)
return; return;

2
menu/drivers_display/menu_display_gl.c
View File

@ -40,7 +40,7 @@ static const GLfloat gl_tex_coords[] = {
static gl_t *gl_get_ptr(void) static gl_t *gl_get_ptr(void)
{ {
gl_t *gl = (gl_t*)video_driver_get_ptr(); gl_t *gl = (gl_t*)video_driver_get_ptr(false);
if (!gl) if (!gl)
return NULL; return NULL;
return gl; return gl;

2
menu/menu_display.c
View File

@ -239,7 +239,7 @@ bool menu_display_init_main_font(void *data,
{ {
bool ret; bool ret;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
void *video = video_driver_get_ptr(); void *video = video_driver_get_ptr(false);
menu_display_t *disp = menu_display_get_ptr(); menu_display_t *disp = menu_display_get_ptr();
if (!disp) if (!disp)