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

Rename video_driver_resolve to video_driver_get_ptr

This commit is contained in:
twinaphex 2015-03-21 23:46:49 +01:00
parent 06d643adaa
commit 5d0815a7b7
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_shader/shader_null.c
View File

@ -51,7 +51,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_resolve(NULL); gl_t *gl = (gl_t*)video_driver_get_ptr(NULL);
if (gl) if (gl)
{ {
gl_ff_matrix(mat); gl_ff_matrix(mat);
@ -65,7 +65,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_resolve(NULL); gl_t *gl = (gl_t*)video_driver_get_ptr(NULL);
if (gl) if (gl)
{ {
const struct gl_coords *coords = (const struct gl_coords*)data; const struct gl_coords *coords = (const struct gl_coords*)data;

4
gfx/video_driver.c
View File

@ -194,7 +194,7 @@ void find_video_driver(void)
} }
/** /**
* video_driver_resolve: * video_driver_get_ptr:
* @drv : real video driver will be set to this. * @drv : real video driver will be set to this.
* *
* Use this if you need the real video driver * Use this if you need the real video driver
@ -202,7 +202,7 @@ void find_video_driver(void)
* *
* Returns: video driver's userdata. * Returns: video driver's userdata.
**/ **/
void *video_driver_resolve(const video_driver_t **drv) void *video_driver_get_ptr(const video_driver_t **drv)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();

4
gfx/video_driver.h
View File

@ -239,7 +239,7 @@ const char* config_get_video_driver_options(void);
void find_video_driver(void); void find_video_driver(void);
/** /**
* video_driver_resolve: * video_driver_get_ptr:
* @drv : real video driver will be set to this. * @drv : real video driver will be set to this.
* *
* Use this if you need the real video driver * Use this if you need the real video driver
@ -247,7 +247,7 @@ void find_video_driver(void);
* *
* Returns: video driver's userdata. * Returns: video driver's userdata.
**/ **/
void *video_driver_resolve(const video_driver_t **drv); void *video_driver_get_ptr(const video_driver_t **drv);
/** /**
* video_driver_get_current_framebuffer: * video_driver_get_current_framebuffer:

8
menu/drivers/glui.c
View File

@ -233,7 +233,7 @@ static void glui_render_messagebox(const char *message)
if (!menu) if (!menu)
return; return;
gl = (gl_t*)video_driver_resolve(NULL); gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl) if (!gl)
return; return;
@ -283,7 +283,7 @@ static void glui_render(void)
if (!glui) if (!glui)
return; return;
gl = (gl_t*)video_driver_resolve(NULL); gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl) if (!gl)
return; return;
@ -341,7 +341,7 @@ static void glui_frame(void)
if (!menu) if (!menu)
return; return;
gl = (gl_t*)video_driver_resolve(NULL); gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl) if (!gl)
return; return;
@ -478,7 +478,7 @@ static void *glui_init(void)
glui_handle_t *glui = NULL; glui_handle_t *glui = NULL;
const video_driver_t *video_driver = NULL; const video_driver_t *video_driver = NULL;
menu_handle_t *menu = NULL; menu_handle_t *menu = NULL;
gl_t *gl = (gl_t*)video_driver_resolve(&video_driver); gl_t *gl = (gl_t*)video_driver_get_ptr(&video_driver);
if (video_driver != &video_gl || !gl) if (video_driver != &video_gl || !gl)
{ {

8
menu/drivers/xmb.c
View File

@ -517,7 +517,7 @@ static void xmb_frame_messagebox(const char *message)
if (!xmb) if (!xmb)
return; return;
gl = (gl_t*)video_driver_resolve(NULL); gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl) if (!gl)
return; return;
@ -1262,7 +1262,7 @@ static void xmb_frame(void)
if (!xmb) if (!xmb)
return; return;
gl = (gl_t*)video_driver_resolve(NULL); gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl) if (!gl)
return; return;
@ -1393,7 +1393,7 @@ static void *xmb_init(void)
xmb_handle_t *xmb = NULL; xmb_handle_t *xmb = NULL;
const video_driver_t *video_driver = NULL; const video_driver_t *video_driver = NULL;
float scale_factor = 1; float scale_factor = 1;
gl_t *gl = (gl_t*)video_driver_resolve(&video_driver); gl_t *gl = (gl_t*)video_driver_get_ptr(&video_driver);
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
if (video_driver != &video_gl || !gl) if (video_driver != &video_gl || !gl)
@ -1583,7 +1583,7 @@ static void xmb_context_reset(void)
if (!menu) if (!menu)
return; return;
gl = (gl_t*)video_driver_resolve(NULL); gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl) if (!gl)
return; return;