Remove some stub functions

gfx/drivers_display/gfx_display_ctr.c

@@ -27,10 +27,6 @@
 #include "../drivers/ctr_gu.h"
 #include "../../ctr/gpu_old.h"
 
-static const float *gfx_display_ctr_get_default_vertices(void) { return NULL; }
-static const float *gfx_display_ctr_get_default_tex_coords(void) { return NULL; }
-static void *gfx_display_ctr_get_default_mvp(void *data) { return NULL; }
-
 static void gfx_display_ctr_blend_begin(void *data) { }
 static void gfx_display_ctr_blend_end(void *data) { }
 static void gfx_display_ctr_viewport(gfx_display_ctx_draw_t *draw,
@@ -156,9 +152,9 @@ gfx_display_ctx_driver_t gfx_display_ctx_ctr = {
    gfx_display_ctr_viewport,
    gfx_display_ctr_blend_begin,
    gfx_display_ctr_blend_end,
-   gfx_display_ctr_get_default_mvp,
+   NULL,                                     /* get_default_mvp        */
-   gfx_display_ctr_get_default_vertices,
+   NULL,                                     /* get_default_vertices   */
-   gfx_display_ctr_get_default_tex_coords,
+   NULL,                                     /* get_default_tex_coords */
    gfx_display_ctr_font_init_first,
    GFX_VIDEO_DRIVER_CTR,
    "ctr",

gfx/drivers_display/gfx_display_d3d10.c

@@ -28,21 +28,6 @@
 #include "../font_driver.h"
 #include "../common/d3d10_common.h"
 
-static const float* gfx_display_d3d10_get_default_vertices(void)
-{
-   return NULL;
-}
-
-static const float* gfx_display_d3d10_get_default_tex_coords(void)
-{
-   return NULL;
-}
-
-static void* gfx_display_d3d10_get_default_mvp(void *data)
-{
-   return NULL;
-}
-
 static void gfx_display_d3d10_blend_begin(void *data)
 {
    d3d10_video_t* d3d10 = (d3d10_video_t*)data;
@@ -296,9 +281,9 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d10 = {
    gfx_display_d3d10_viewport,
    gfx_display_d3d10_blend_begin,
    gfx_display_d3d10_blend_end,
-   gfx_display_d3d10_get_default_mvp,
+   NULL,                                     /* get_default_mvp        */
-   gfx_display_d3d10_get_default_vertices,
+   NULL,                                     /* get_default_vertices   */
-   gfx_display_d3d10_get_default_tex_coords,
+   NULL,                                     /* get_default_tex_coords */
    gfx_display_d3d10_font_init_first,
    GFX_VIDEO_DRIVER_DIRECT3D10,
    "d3d10",

gfx/drivers_display/gfx_display_d3d11.c

@@ -27,21 +27,6 @@
 #include "../font_driver.h"
 #include "../common/d3d11_common.h"
 
-static const float* gfx_display_d3d11_get_default_vertices(void)
-{
-   return NULL;
-}
-
-static const float* gfx_display_d3d11_get_default_tex_coords(void)
-{
-   return NULL;
-}
-
-static void* gfx_display_d3d11_get_default_mvp(void *data)
-{
-   return NULL;
-}
-
 static void gfx_display_d3d11_blend_begin(void *data)
 {
    d3d11_video_t* d3d11 = (d3d11_video_t*)data;
@@ -297,9 +282,9 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d11 = {
    gfx_display_d3d11_viewport,
    gfx_display_d3d11_blend_begin,
    gfx_display_d3d11_blend_end,
-   gfx_display_d3d11_get_default_mvp,
+   NULL,                                     /* get_default_mvp */
-   gfx_display_d3d11_get_default_vertices,
+   NULL,                                     /* get_default_vertices */
-   gfx_display_d3d11_get_default_tex_coords,
+   NULL,                                     /* get_default_tex_coords */
    gfx_display_d3d11_font_init_first,
    GFX_VIDEO_DRIVER_DIRECT3D11,
    "d3d11",

gfx/drivers_display/gfx_display_d3d12.c

@@ -27,21 +27,6 @@
 #include "../font_driver.h"
 #include "../common/d3d12_common.h"
 
-static const float* gfx_display_d3d12_get_default_vertices(void)
-{
-   return NULL;
-}
-
-static const float* gfx_display_d3d12_get_default_tex_coords(void)
-{
-   return NULL;
-}
-
-static void* gfx_display_d3d12_get_default_mvp(void *data)
-{
-   return NULL;
-}
-
 static void gfx_display_d3d12_blend_begin(void *data)
 {
    d3d12_video_t* d3d12 = (d3d12_video_t*)data;
@@ -317,9 +302,9 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d12 = {
    gfx_display_d3d12_viewport,
    gfx_display_d3d12_blend_begin,
    gfx_display_d3d12_blend_end,
-   gfx_display_d3d12_get_default_mvp,
+   NULL,                                     /* get_default_mvp        */
-   gfx_display_d3d12_get_default_vertices,
+   NULL,                                     /* get_default_vertices   */
-   gfx_display_d3d12_get_default_tex_coords,
+   NULL,                                     /* get_default_tex_coords */
    gfx_display_d3d12_font_init_first,
    GFX_VIDEO_DRIVER_DIRECT3D12,
    "d3d12",

gfx/drivers_display/gfx_display_gdi.c

@@ -32,7 +32,19 @@
 #include "../common/gdi_common.h"
 #endif
 
-static void *gfx_display_gdi_get_default_mvp(void *data) { return NULL; }
+static const float *gfx_display_gdi_get_default_vertices(void)
+{
+   static float dummy[16] = {0.0f};
+   return &dummy[0];
+}
+
+static const float *gfx_display_gdi_get_default_tex_coords(void)
+{
+   static float dummy[16] = {0.0f};
+   return &dummy[0];
+}
+
+
 static void gfx_display_gdi_blend_begin(void *data) { }
 static void gfx_display_gdi_blend_end(void *data) { }
 
@@ -124,31 +136,19 @@ static bool gfx_display_gdi_font_init_first(
    return true;
 }
 
-static const float *gfx_display_gdi_get_default_vertices(void)
-{
-   static float dummy[16] = {0.0f};
-   return &dummy[0];
-}
-
-static const float *gfx_display_gdi_get_default_tex_coords(void)
-{
-   static float dummy[16] = {0.0f};
-   return &dummy[0];
-}
-
 gfx_display_ctx_driver_t gfx_display_ctx_gdi = {
    gfx_display_gdi_draw,
    gfx_display_gdi_draw_pipeline,
    gfx_display_gdi_viewport,
    gfx_display_gdi_blend_begin,
    gfx_display_gdi_blend_end,
-   gfx_display_gdi_get_default_mvp,
+   NULL,                                     /* get_default_mvp */
    gfx_display_gdi_get_default_vertices,
    gfx_display_gdi_get_default_tex_coords,
    gfx_display_gdi_font_init_first,
    GFX_VIDEO_DRIVER_GDI,
    "gdi",
    false,
-   NULL, /* scissor_begin */
+   NULL,                                     /* scissor_begin */
-   NULL  /* scissor_end   */
+   NULL                                      /* scissor_end   */
 };

gfx/drivers_display/gfx_display_switch.c

@@ -22,7 +22,6 @@
 
 #include "../gfx_display.h"
 
-static void *gfx_display_switch_get_default_mvp(void *data) { return NULL; }
 static void gfx_display_switch_blend_begin(void *data) { }
 static void gfx_display_switch_blend_end(void *data) { }
 static void gfx_display_switch_draw(gfx_display_ctx_draw_t *draw,
@@ -64,13 +63,13 @@ gfx_display_ctx_driver_t gfx_display_ctx_switch = {
    gfx_display_switch_viewport,
    gfx_display_switch_blend_begin,
    gfx_display_switch_blend_end,
-   gfx_display_switch_get_default_mvp,
+   NULL,                                        /* get_default_mvp */
    gfx_display_switch_get_default_vertices,
    gfx_display_switch_get_default_tex_coords,
    gfx_display_switch_font_init_first,
    GFX_VIDEO_DRIVER_SWITCH,
    "switch",
    false,
-   NULL, /* scissor_begin */
+   NULL,                                         /* scissor_begin */
-   NULL  /* scissor_end   */
+   NULL                                          /* scissor_end   */
 };

gfx/drivers_display/gfx_display_wiiu.c

@@ -28,9 +28,6 @@
 #include "../../wiiu/system/memory.h"
 #include "../../wiiu/wiiu_dbg.h"
 
-static const float *gfx_display_wiiu_get_default_vertices(void) { return NULL; }
-static const float *gfx_display_wiiu_get_default_tex_coords(void) { return NULL; }
-static void *gfx_display_wiiu_get_default_mvp(void *data) { return NULL; }
 static void gfx_display_wiiu_blend_begin(void *data) { }
 static void gfx_display_wiiu_blend_end(void *data) { }
 static void gfx_display_wiiu_viewport(gfx_display_ctx_draw_t *draw, void *data) { }
@@ -305,9 +302,9 @@ gfx_display_ctx_driver_t gfx_display_ctx_wiiu = {
    gfx_display_wiiu_viewport,
    gfx_display_wiiu_blend_begin,
    gfx_display_wiiu_blend_end,
-   gfx_display_wiiu_get_default_mvp,
+   NULL,                                     /* get_default_mvp        */
-   gfx_display_wiiu_get_default_vertices,
+   NULL,                                     /* get_default_vertices   */
-   gfx_display_wiiu_get_default_tex_coords,
+   NULL,                                     /* get_default_tex_coords */
    gfx_display_wiiu_font_init_first,
    GFX_VIDEO_DRIVER_WIIU,
    "gx2",

gfx/gfx_display.c

@@ -40,7 +40,6 @@
  * needs to be refactored */
 uintptr_t gfx_display_white_texture;
 
-static void *gfx_display_null_get_default_mvp(void *data) { return NULL; }
 static void gfx_display_null_blend_begin(void *data) { }
 static void gfx_display_null_blend_end(void *data) { }
 static void gfx_display_null_draw(gfx_display_ctx_draw_t *draw,
@@ -81,7 +80,7 @@ gfx_display_ctx_driver_t gfx_display_ctx_null = {
    gfx_display_null_viewport,
    gfx_display_null_blend_begin,
    gfx_display_null_blend_end,
-   gfx_display_null_get_default_mvp,
+   NULL,                                     /* get_default_mvp */
    gfx_display_null_get_default_vertices,
    gfx_display_null_get_default_tex_coords,
    gfx_display_null_font_init_first,
@@ -684,9 +683,9 @@ void gfx_display_draw_bg(gfx_display_ctx_draw_t *draw,
    new_vertex           = draw->vertex;
    new_tex_coord        = draw->tex_coord;
 
-   if (!new_vertex)
+   if (!new_vertex    && dispctx->get_default_vertices)
       new_vertex        = dispctx->get_default_vertices();
-   if (!new_tex_coord)
+   if (!new_tex_coord && dispctx->get_default_tex_coords)
       new_tex_coord     = dispctx->get_default_tex_coords();
 
    coords.vertices      = (unsigned)draw->vertex_count;