From ddde58caf45c346c99aa73bb0628adf90f555f0d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 20 Nov 2015 18:50:21 +0100
Subject: [PATCH] Simplify video_driver_get_ptr

---
 gfx/drivers_shader/shader_null.c          | 4 ++--
 gfx/video_driver.c                        | 7 ++-----
 gfx/video_driver.h                        | 3 +--
 menu/drivers_display/menu_display_d3d.cpp | 2 +-
 menu/drivers_display/menu_display_gl.c    | 2 +-
 menu/menu_display.c                       | 2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c
index 3490002952..39946fffd6 100644
--- a/gfx/drivers_shader/shader_null.c
+++ b/gfx/drivers_shader/shader_null.c
@@ -54,7 +54,7 @@ static bool shader_null_set_mvp(void *data, const math_matrix_4x4 *mat)
 {
 #ifdef HAVE_OPENGL
 #ifndef NO_GL_FF_MATRIX
-   gl_t *gl = (gl_t*)video_driver_get_ptr(NULL);
+   gl_t *gl = (gl_t*)video_driver_get_ptr();
    if (gl)
    {
       gl_ff_matrix(mat);
@@ -68,7 +68,7 @@ static bool shader_null_set_coords(const void *data)
 {
 #ifdef HAVE_OPENGL
 #ifndef NO_GL_FF_VERTEX
-   gl_t *gl = (gl_t*)video_driver_get_ptr(NULL);
+   gl_t *gl = (gl_t*)video_driver_get_ptr();
    if (gl)
    {
       const struct gfx_coords *coords = (const struct gfx_coords*)data;
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index d64e2021b5..f9e8bd8084 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -203,14 +203,13 @@ static bool find_video_driver(void)
 
 /**
  * video_driver_get_ptr:
- * @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 *video_driver_get_ptr(const video_driver_t **drv)
+void *video_driver_get_ptr(void)
 {
    driver_t *driver     = driver_get_ptr();
 
@@ -219,10 +218,8 @@ void *video_driver_get_ptr(const video_driver_t **drv)
 
    if (settings->video.threaded
          && !video_state.hw_render_callback.context_type)
-      return rarch_threaded_video_get_ptr(drv);
+      return rarch_threaded_video_get_ptr(NULL);
 #endif
-   if (drv)
-      *drv = driver->video;
 
    return driver->video_data;
 }
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 8e340bc0e5..6f5c2613c2 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -268,14 +268,13 @@ const char* config_get_video_driver_options(void);
 
 /**
  * video_driver_get_ptr:
- * @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 *video_driver_get_ptr(const video_driver_t **drv);
+void *video_driver_get_ptr(void);
 
 /**
  * video_driver_get_current_framebuffer:
diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index e8a558b95c..e4dc343c2c 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -45,7 +45,7 @@ static const float d3d_tex_coords[] = {
 
 static d3d_video_t *d3d_get_ptr(void)
 {
-   d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL);
+   d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr();
 
    if (!d3d)
       return NULL;
diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c
index b6ca70e78b..4e9e3a0f51 100644
--- a/menu/drivers_display/menu_display_gl.c
+++ b/menu/drivers_display/menu_display_gl.c
@@ -40,7 +40,7 @@ static const GLfloat gl_tex_coords[] = {
 
 static gl_t *gl_get_ptr(void)
 {
-   gl_t *gl = (gl_t*)video_driver_get_ptr(NULL);
+   gl_t *gl = (gl_t*)video_driver_get_ptr();
    if (!gl)
       return NULL;
    return gl;
diff --git a/menu/menu_display.c b/menu/menu_display.c
index 80500c4fdd..ce1c85e725 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -239,7 +239,7 @@ bool menu_display_init_main_font(void *data,
 {
    bool      ret;
    driver_t    *driver  = driver_get_ptr();
-   void        *video   = video_driver_get_ptr(NULL);
+   void        *video   = video_driver_get_ptr();
    menu_display_t *disp = menu_display_get_ptr();
 
    if (!disp)