From fe1255094fcd2c517ac417cf36cccaef5b4e0954 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 18 Mar 2019 05:04:23 +0100 Subject: [PATCH] Get rid of now unused set_coords in video_driver_poke_interface --- gfx/drivers/caca_gfx.c | 1 - gfx/drivers/ctr_gfx.c | 1 - gfx/drivers/d3d10.c | 1 - gfx/drivers/d3d11.c | 1 - gfx/drivers/d3d12.c | 1 - gfx/drivers/d3d8.c | 1 - gfx/drivers/d3d9.c | 1 - gfx/drivers/dispmanx_gfx.c | 1 - gfx/drivers/drm_gfx.c | 1 - gfx/drivers/exynos_gfx.c | 1 - gfx/drivers/gdi_gfx.c | 1 - gfx/drivers/gl.c | 1 - gfx/drivers/gl1.c | 15 --------------- gfx/drivers/gl_core.c | 1 - gfx/drivers/gx2_gfx.c | 1 - gfx/drivers/gx_gfx.c | 1 - gfx/drivers/omap_gfx.c | 1 - gfx/drivers/ps2_gfx.c | 1 - gfx/drivers/psp1_gfx.c | 1 - gfx/drivers/sdl2_gfx.c | 1 - gfx/drivers/sdl_gfx.c | 1 - gfx/drivers/sixel_gfx.c | 1 - gfx/drivers/sunxi_gfx.c | 1 - gfx/drivers/switch_gfx.c | 1 - gfx/drivers/switch_nx_gfx.c | 1 - gfx/drivers/vga_gfx.c | 1 - gfx/drivers/vita2d_gfx.c | 1 - gfx/drivers/vulkan.c | 1 - gfx/drivers/xshm_gfx.c | 1 - gfx/drivers/xvideo.c | 1 - gfx/video_driver.c | 15 --------------- gfx/video_driver.h | 4 ---- gfx/video_thread_wrapper.c | 1 - 33 files changed, 64 deletions(-) diff --git a/gfx/drivers/caca_gfx.c b/gfx/drivers/caca_gfx.c index 05f5d17205..6a2abac951 100644 --- a/gfx/drivers/caca_gfx.c +++ b/gfx/drivers/caca_gfx.c @@ -306,7 +306,6 @@ static void caca_set_osd_msg(void *data, static const video_poke_interface_t caca_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index ee59e53baf..a87a659f90 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -1144,7 +1144,6 @@ static void ctr_set_osd_msg(void *data, static const video_poke_interface_t ctr_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ ctr_load_texture, ctr_unload_texture, diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c index 812986a717..c20116ca6f 100644 --- a/gfx/drivers/d3d10.c +++ b/gfx/drivers/d3d10.c @@ -1684,7 +1684,6 @@ static uint32_t d3d10_get_flags(void *data) static const video_poke_interface_t d3d10_poke_interface = { d3d10_get_flags, - NULL, /* set_coords */ NULL, /* set_mvp */ d3d10_gfx_load_texture, d3d10_gfx_unload_texture, diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c index 8921fd44eb..a27864e1d1 100644 --- a/gfx/drivers/d3d11.c +++ b/gfx/drivers/d3d11.c @@ -1751,7 +1751,6 @@ static uint32_t d3d11_get_flags(void *data) static const video_poke_interface_t d3d11_poke_interface = { d3d11_get_flags, - NULL, /* set_coords */ NULL, /* set_mvp */ d3d11_gfx_load_texture, d3d11_gfx_unload_texture, diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c index 354007c7a9..733803ea19 100644 --- a/gfx/drivers/d3d12.c +++ b/gfx/drivers/d3d12.c @@ -1797,7 +1797,6 @@ static uint32_t d3d12_get_flags(void *data) static const video_poke_interface_t d3d12_poke_interface = { d3d12_get_flags, - NULL, /* set_coords */ NULL, /* set_mvp */ d3d12_gfx_load_texture, d3d12_gfx_unload_texture, diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index b6f58d3c10..9ffe225e2d 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -1854,7 +1854,6 @@ static uint32_t d3d8_get_flags(void *data) static const video_poke_interface_t d3d_poke_interface = { d3d8_get_flags, - NULL, /* set_coords */ d3d8_set_mvp, d3d8_load_texture, d3d8_unload_texture, diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index 9a3ea1703f..e79b527297 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -2053,7 +2053,6 @@ static uint32_t d3d9_get_flags(void *data) static const video_poke_interface_t d3d9_poke_interface = { d3d9_get_flags, - NULL, /* set_coords */ d3d9_set_mvp, d3d9_load_texture, d3d9_unload_texture, diff --git a/gfx/drivers/dispmanx_gfx.c b/gfx/drivers/dispmanx_gfx.c index 386d2bcc38..e0262894d7 100644 --- a/gfx/drivers/dispmanx_gfx.c +++ b/gfx/drivers/dispmanx_gfx.c @@ -632,7 +632,6 @@ static void dispmanx_set_aspect_ratio (void *data, unsigned aspect_ratio_idx) static const video_poke_interface_t dispmanx_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c index 4f071167c2..d2cf0b1dc2 100644 --- a/gfx/drivers/drm_gfx.c +++ b/gfx/drivers/drm_gfx.c @@ -966,7 +966,6 @@ static void drm_set_aspect_ratio (void *data, unsigned aspect_ratio_idx) static const video_poke_interface_t drm_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/exynos_gfx.c b/gfx/drivers/exynos_gfx.c index ce2256a84e..a166bc9a8e 100644 --- a/gfx/drivers/exynos_gfx.c +++ b/gfx/drivers/exynos_gfx.c @@ -1489,7 +1489,6 @@ static void exynos_show_mouse(void *data, bool state) static const video_poke_interface_t exynos_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c index c30cefd736..667c8724f6 100644 --- a/gfx/drivers/gdi_gfx.c +++ b/gfx/drivers/gdi_gfx.c @@ -631,7 +631,6 @@ static void gdi_unload_texture(void *data, uintptr_t handle) static const video_poke_interface_t gdi_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ gdi_load_texture, gdi_unload_texture, diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 8ee8560010..81b040f391 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -4142,7 +4142,6 @@ static uint32_t gl2_get_flags(void *data) static const video_poke_interface_t gl2_poke_interface = { gl2_get_flags, - NULL, /* set_coords */ NULL, /* set_mvp */ gl2_load_texture, gl2_unload_texture, diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c index 2798479e7a..4bbd0ea7ea 100644 --- a/gfx/drivers/gl1.c +++ b/gfx/drivers/gl1.c @@ -1248,23 +1248,8 @@ static uint32_t gl1_get_flags(void *data) return flags; } -static void gl1_set_coords(void *handle_data, void *shader_data, - const struct video_coords *coords) -{ - gl1_t *gl1 = (gl1_t*)handle_data; - - if (!gl1) - return; - - gl1->coords.vertex = coords->vertex; - gl1->coords.color = coords->color; - gl1->coords.tex_coord = coords->tex_coord; - gl1->coords.lut_tex_coord = coords->lut_tex_coord; -} - static const video_poke_interface_t gl1_poke_interface = { gl1_get_flags, - gl1_set_coords, NULL, gl1_load_texture, gl1_unload_texture, diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c index 1210f3d6c6..5ef082ddbb 100644 --- a/gfx/drivers/gl_core.c +++ b/gfx/drivers/gl_core.c @@ -1960,7 +1960,6 @@ static retro_proc_address_t gl_core_get_proc_address(void *data, const char *sym static const video_poke_interface_t gl_core_poke_interface = { gl_core_get_flags, - NULL, /* set_coords */ NULL, /* set_mvp */ gl_core_load_texture, gl_core_unload_texture, diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c index eb90ff3aa0..9c0e8354bc 100644 --- a/gfx/drivers/gx2_gfx.c +++ b/gfx/drivers/gx2_gfx.c @@ -1717,7 +1717,6 @@ static uint32_t wiiu_gfx_get_flags(void *data) static const video_poke_interface_t wiiu_poke_interface = { wiiu_gfx_get_flags, - NULL, /* set_coords */ NULL, /* set_mvp */ wiiu_gfx_load_texture, wiiu_gfx_unload_texture, diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c index 25c615e246..14438aa9c8 100644 --- a/gfx/drivers/gx_gfx.c +++ b/gfx/drivers/gx_gfx.c @@ -1265,7 +1265,6 @@ static void gx_get_video_output_next(void *data) static const video_poke_interface_t gx_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c index 992472eaa2..783a9a838e 100644 --- a/gfx/drivers/omap_gfx.c +++ b/gfx/drivers/omap_gfx.c @@ -1138,7 +1138,6 @@ static float omap_get_refresh_rate(void *data) static const video_poke_interface_t omap_gfx_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/ps2_gfx.c b/gfx/drivers/ps2_gfx.c index 381848be92..4ef83f763a 100644 --- a/gfx/drivers/ps2_gfx.c +++ b/gfx/drivers/ps2_gfx.c @@ -470,7 +470,6 @@ static bool ps2_get_hw_render_interface(void* data, static const video_poke_interface_t ps2_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c index 773fe26b7c..c05397797a 100644 --- a/gfx/drivers/psp1_gfx.c +++ b/gfx/drivers/psp1_gfx.c @@ -832,7 +832,6 @@ static void psp_viewport_info(void *data, struct video_viewport *vp) static const video_poke_interface_t psp_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c index eb13938958..c7f73fe24f 100644 --- a/gfx/drivers/sdl2_gfx.c +++ b/gfx/drivers/sdl2_gfx.c @@ -726,7 +726,6 @@ static void sdl2_grab_mouse_toggle(void *data) static video_poke_interface_t sdl2_video_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c index 18a54cdac5..914fa3d5dc 100644 --- a/gfx/drivers/sdl_gfx.c +++ b/gfx/drivers/sdl_gfx.c @@ -518,7 +518,6 @@ static void sdl_grab_mouse_toggle(void *data) static const video_poke_interface_t sdl_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/sixel_gfx.c b/gfx/drivers/sixel_gfx.c index bf288c7f80..10feb2d56f 100644 --- a/gfx/drivers/sixel_gfx.c +++ b/gfx/drivers/sixel_gfx.c @@ -603,7 +603,6 @@ static const video_poke_interface_t sixel_poke_interface = { NULL, NULL, NULL, - NULL, sixel_set_video_mode, NULL, NULL, diff --git a/gfx/drivers/sunxi_gfx.c b/gfx/drivers/sunxi_gfx.c index baf909520a..b4d8390d01 100644 --- a/gfx/drivers/sunxi_gfx.c +++ b/gfx/drivers/sunxi_gfx.c @@ -944,7 +944,6 @@ static float sunxi_get_refresh_rate (void *data) static const video_poke_interface_t sunxi_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/switch_gfx.c b/gfx/drivers/switch_gfx.c index 954938ef3f..04c442654c 100644 --- a/gfx/drivers/switch_gfx.c +++ b/gfx/drivers/switch_gfx.c @@ -406,7 +406,6 @@ static void switch_set_texture_enable(void *data, bool enable, bool full_screen) static const video_poke_interface_t switch_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, /* load_texture */ NULL, /* unload_texture */ diff --git a/gfx/drivers/switch_nx_gfx.c b/gfx/drivers/switch_nx_gfx.c index b54701e720..8c7c603aa0 100644 --- a/gfx/drivers/switch_nx_gfx.c +++ b/gfx/drivers/switch_nx_gfx.c @@ -755,7 +755,6 @@ void switch_overlay_interface(void *data, const video_overlay_interface_t **ifac static const video_poke_interface_t switch_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, /* load_texture */ NULL, /* unload_texture */ diff --git a/gfx/drivers/vga_gfx.c b/gfx/drivers/vga_gfx.c index 22182a6229..02db6a474f 100644 --- a/gfx/drivers/vga_gfx.c +++ b/gfx/drivers/vga_gfx.c @@ -391,7 +391,6 @@ static void vga_set_osd_msg(void *data, static const video_poke_interface_t vga_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c index 3e253ee8d4..4a3cbb33ae 100644 --- a/gfx/drivers/vita2d_gfx.c +++ b/gfx/drivers/vita2d_gfx.c @@ -790,7 +790,6 @@ static bool vita_get_current_sw_framebuffer(void *data, static const video_poke_interface_t vita_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ vita_load_texture, vita_unload_texture, diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index 297170de5e..e35a875b77 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -2407,7 +2407,6 @@ static uint32_t vulkan_get_flags(void *data) static const video_poke_interface_t vulkan_poke_interface = { vulkan_get_flags, - NULL, /* set_coords */ NULL, /* set_mvp */ vulkan_load_texture, vulkan_unload_texture, diff --git a/gfx/drivers/xshm_gfx.c b/gfx/drivers/xshm_gfx.c index ea728793cc..cfeda3481b 100644 --- a/gfx/drivers/xshm_gfx.c +++ b/gfx/drivers/xshm_gfx.c @@ -205,7 +205,6 @@ static void xshm_grab_mouse_toggle(void *data) static video_poke_interface_t xshm_video_poke_interface = { NULL, /* get_flags */ - NULL, /* set_coords */ NULL, /* set_mvp */ NULL, NULL, diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c index 619cbaa712..70fc2b5d27 100644 --- a/gfx/drivers/xvideo.c +++ b/gfx/drivers/xvideo.c @@ -940,7 +940,6 @@ static video_poke_interface_t xv_video_poke_interface = { NULL, NULL, NULL, - NULL, x11_get_refresh_rate, NULL, NULL, diff --git a/gfx/video_driver.c b/gfx/video_driver.c index d0fed6987e..db87f6183f 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -3544,21 +3544,6 @@ bool video_shader_driver_init(video_shader_ctx_init_t *init) return true; } -void video_driver_set_coords(video_shader_ctx_coords_t *coords) -{ - if (current_shader && current_shader->set_coords) - current_shader->set_coords(coords->handle_data, - current_shader_data, - (const struct video_coords*)coords->data); - else - { - if (video_driver_poke && video_driver_poke->set_coords) - video_driver_poke->set_coords(coords->handle_data, - current_shader_data, - (const struct video_coords*)coords->data); - } -} - void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp) { if (!mvp || !mvp->matrix) diff --git a/gfx/video_driver.h b/gfx/video_driver.h index 4d2d8597dc..de35ab60b2 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -691,8 +691,6 @@ struct aspect_ratio_elem typedef struct video_poke_interface { uint32_t (*get_flags)(void *data); - void (*set_coords)(void *handle_data, void *shader_data, - const struct video_coords *coords); void (*set_mvp)(void *data, void *shader_data, const void *mat_data); uintptr_t (*load_texture)(void *video_data, void *data, @@ -1198,8 +1196,6 @@ bool video_shader_driver_init_first(const void *data); bool video_shader_driver_init(video_shader_ctx_init_t *init); -void video_driver_set_coords(video_shader_ctx_coords_t *coords); - void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp); float video_driver_get_refresh_rate(void); diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c index c04a8b7d57..94f4b9f727 100644 --- a/gfx/video_thread_wrapper.c +++ b/gfx/video_thread_wrapper.c @@ -1241,7 +1241,6 @@ static uint32_t thread_get_flags(void *data) static const video_poke_interface_t thread_poke = { thread_get_flags, - NULL, /* set_coords */ NULL, /* set_mvp */ thread_load_texture, thread_unload_texture,