From d7cbb4472ee7a80a331fe495fa3782687bd9cfa7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 15 Apr 2016 04:20:57 +0200
Subject: [PATCH] Cleanups

---
 menu/drivers_display/menu_display_d3d.cpp  | 4 +---
 menu/drivers_display/menu_display_gl.c     | 4 +---
 menu/drivers_display/menu_display_null.c   | 4 ++--
 menu/drivers_display/menu_display_vulkan.c | 4 +---
 menu/menu_display.h                        | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index e8e8a21b04..87f2c86fae 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -164,12 +164,10 @@ static void menu_display_d3d_restore_clear_color(void)
    d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0);
 }
 
-static void menu_display_d3d_clear_color(void *data)
+static void menu_display_d3d_clear_color(menu_display_ctx_clearcolor_t *clearcolor)
 {
    DWORD    clear_color                      = 0;
    d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(false);
-   menu_display_ctx_clearcolor_t *clearcolor = 
-      (menu_display_ctx_clearcolor_t*)data;
 
    if (!d3d || !clearcolor)
       return;
diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c
index cdecbf575c..5c87229bda 100644
--- a/menu/drivers_display/menu_display_gl.c
+++ b/menu/drivers_display/menu_display_gl.c
@@ -143,10 +143,8 @@ static void menu_display_gl_restore_clear_color(void)
    glClearColor(0.0f, 0.0f, 0.0f, 0.00f);
 }
 
-static void menu_display_gl_clear_color(void *data)
+static void menu_display_gl_clear_color(menu_display_ctx_clearcolor_t *clearcolor)
 {
-   menu_display_ctx_clearcolor_t *clearcolor = 
-      (menu_display_ctx_clearcolor_t*)data;
    if (!clearcolor)
       return;
 
diff --git a/menu/drivers_display/menu_display_null.c b/menu/drivers_display/menu_display_null.c
index 52203f88f3..8f3105ddf8 100644
--- a/menu/drivers_display/menu_display_null.c
+++ b/menu/drivers_display/menu_display_null.c
@@ -46,9 +46,9 @@ static void menu_display_null_restore_clear_color(void)
 {
 }
 
-static void menu_display_null_clear_color(void *data)
+static void menu_display_null_clear_color(menu_display_ctx_clearcolor_t *clearcolor)
 {
-   (void)data;
+   (void)clearcolor;
 }
 
 static bool menu_display_null_font_init_first(
diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c
index e557f6e373..674dfca1c8 100644
--- a/menu/drivers_display/menu_display_vulkan.c
+++ b/menu/drivers_display/menu_display_vulkan.c
@@ -141,12 +141,10 @@ static void menu_display_vk_restore_clear_color(void)
 {
 }
 
-static void menu_display_vk_clear_color(void *data)
+static void menu_display_vk_clear_color(menu_display_ctx_clearcolor_t *clearcolor)
 {
    VkClearRect rect;
    VkClearAttachment attachment;
-   menu_display_ctx_clearcolor_t *clearcolor =
-      (menu_display_ctx_clearcolor_t*)data;
    vk_t *vk                      = (vk_t*)video_driver_get_ptr(false);
    if (!vk || !clearcolor)
       return;
diff --git a/menu/menu_display.h b/menu/menu_display.h
index fba33731d7..9c79e71660 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -149,7 +149,7 @@ typedef struct menu_display_ctx_driver
    void (*blend_begin)(void);
    void (*blend_end)(void);
    void (*restore_clear_color)(void);
-   void (*clear_color)(void *data);
+   void (*clear_color)(menu_display_ctx_clearcolor_t *clearcolor);
    void *(*get_default_mvp)(void);
    const float *(*get_default_vertices)(void);
    const float *(*get_default_tex_coords)(void);