diff --git a/Makefile.common b/Makefile.common index 1ed15ad35f..581fb69962 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2037,10 +2037,6 @@ ifneq ($(findstring DOS,$(OS)),) input/drivers/dos_input.o \ input/drivers_joypad/dos_joypad.o \ frontend/drivers/platform_dos.o - - ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += menu/drivers_display/menu_display_vga.o - endif endif ifeq ($(HAVE_STATIC_VIDEO_FILTERS), 1) diff --git a/griffin/griffin.c b/griffin/griffin.c index 36985dd982..380e9e4646 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -1334,10 +1334,6 @@ MENU #include "../menu/drivers_display/menu_display_switch.c" #endif -#ifdef DJGPP -#include "../menu/drivers_display/menu_display_vga.c" -#endif - #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) #ifdef HAVE_GDI #include "../menu/drivers_display/menu_display_gdi.c" diff --git a/menu/drivers_display/menu_display_vga.c b/menu/drivers_display/menu_display_vga.c deleted file mode 100644 index 8c323107c8..0000000000 --- a/menu/drivers_display/menu_display_vga.c +++ /dev/null @@ -1,108 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2011-2016 - Daniel De Matteis - * Copyright (C) 2016-2019 - Brad Parker - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include - -#include -#include - -#include "../../config.def.h" -#include "../../gfx/font_driver.h" -#include "../../retroarch.h" - -#include "../menu_driver.h" - -static void *menu_display_vga_get_default_mvp(video_frame_info_t *video_info) -{ - return NULL; -} - -static void menu_display_vga_blend_begin(video_frame_info_t *video_info) -{ -} - -static void menu_display_vga_blend_end(video_frame_info_t *video_info) -{ -} - -static void menu_display_vga_draw(menu_display_ctx_draw_t *draw, - video_frame_info_t *video_info) -{ -} - -static void menu_display_vga_draw_pipeline(menu_display_ctx_draw_t *draw, - video_frame_info_t *video_info) -{ -} - -static void menu_display_vga_viewport(menu_display_ctx_draw_t *draw, - video_frame_info_t *video_info) -{ -} - -static void menu_display_vga_restore_clear_color(void) -{ -} - -static void menu_display_vga_clear_color( - menu_display_ctx_clearcolor_t *clearcolor, - video_frame_info_t *video_info) -{ - (void)clearcolor; -} - -static bool menu_display_vga_font_init_first( - void **font_handle, void *video_data, - const char *font_path, float font_size, - bool is_threaded) -{ - font_data_t **handle = (font_data_t**)font_handle; - *handle = font_driver_init_first(video_data, - font_path, font_size, true, - is_threaded, FONT_DRIVER_RENDER_VGA); - return *handle; -} - -static const float *menu_display_vga_get_default_vertices(void) -{ - static float dummy[16] = {0.0f}; - return &dummy[0]; -} - -static const float *menu_display_vga_get_default_tex_coords(void) -{ - static float dummy[16] = {0.0f}; - return &dummy[0]; -} - -menu_display_ctx_driver_t menu_display_ctx_vga = { - menu_display_vga_draw, - menu_display_vga_draw_pipeline, - menu_display_vga_viewport, - menu_display_vga_blend_begin, - menu_display_vga_blend_end, - menu_display_vga_restore_clear_color, - menu_display_vga_clear_color, - menu_display_vga_get_default_mvp, - menu_display_vga_get_default_vertices, - menu_display_vga_get_default_tex_coords, - menu_display_vga_font_init_first, - MENU_VIDEO_DRIVER_VGA, - "menu_display_vga", - false, - NULL, - NULL -}; diff --git a/menu/menu_defines.h b/menu/menu_defines.h index 89ec9420da..0e07354425 100644 --- a/menu/menu_defines.h +++ b/menu/menu_defines.h @@ -277,7 +277,6 @@ enum menu_display_driver_type MENU_VIDEO_DRIVER_SIXEL, MENU_VIDEO_DRIVER_GDI, MENU_VIDEO_DRIVER_SWITCH, - MENU_VIDEO_DRIVER_VGA, MENU_VIDEO_DRIVER_FPGA }; diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 580e32f56b..79d8fc6398 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -1685,10 +1685,6 @@ static bool menu_display_check_compatibility( if (string_is_equal(video_driver, "gdi")) return true; break; - case MENU_VIDEO_DRIVER_VGA: - if (string_is_equal(video_driver, "vga")) - return true; - break; case MENU_VIDEO_DRIVER_FPGA: if (string_is_equal(video_driver, "fpga")) return true; diff --git a/menu/menu_driver.h b/menu/menu_driver.h index f74a64e3aa..9ec899175d 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -734,7 +734,6 @@ extern menu_display_ctx_driver_t menu_display_ctx_vita2d; extern menu_display_ctx_driver_t menu_display_ctx_ctr; extern menu_display_ctx_driver_t menu_display_ctx_wiiu; extern menu_display_ctx_driver_t menu_display_ctx_gdi; -extern menu_display_ctx_driver_t menu_display_ctx_vga; extern menu_display_ctx_driver_t menu_display_ctx_fpga; extern menu_display_ctx_driver_t menu_display_ctx_switch; extern menu_display_ctx_driver_t menu_display_ctx_sixel;