From 060ea4310085b61b88a369387f9e0163e23d451a Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Thu, 15 Jun 2023 12:59:32 +0200 Subject: [PATCH] Remove now obsolete xdk1_xfonts.c --- gfx/drivers_font/xdk1_xfonts.c | 131 --------------------------------- gfx/font_driver.c | 3 - gfx/font_driver.h | 1 - griffin/griffin.c | 4 - 4 files changed, 139 deletions(-) delete mode 100644 gfx/drivers_font/xdk1_xfonts.c diff --git a/gfx/drivers_font/xdk1_xfonts.c b/gfx/drivers_font/xdk1_xfonts.c deleted file mode 100644 index abd00d68ca..0000000000 --- a/gfx/drivers_font/xdk1_xfonts.c +++ /dev/null @@ -1,131 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * 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 - -#ifdef HAVE_CONFIG_H -#include "../../config.h" -#endif - -#include "../common/d3d_common.h" -#include "../common/d3d8_defines.h" - -#include "../font_driver.h" - -typedef struct -{ - d3d8_video_t *d3d; - XFONT *debug_font; - D3DSurface *surf; -} xfonts_t; - -static void *xfonts_init(void *video_data, - const char *font_path, float font_size, - bool is_threaded) -{ - xfonts_t *xfont = (xfonts_t*)calloc(1, sizeof(*xfont)); - - if (!xfont) - return NULL; - - xfont->d3d = (d3d8_video_t*)video_data; - - XFONT_OpenDefaultFont(&xfont->debug_font); - -#ifdef __cplusplus - xfont->debug_font->SetBkMode(XFONT_TRANSPARENT); - xfont->debug_font->SetBkColor(D3DCOLOR_ARGB(100,0,0,0)); - xfont->debug_font->SetTextHeight(14); - xfont->debug_font->SetTextAntialiasLevel( - xfont->debug_font->GetTextAntialiasLevel()); -#else - XFONT_SetBkMode(xfont->debug_font, XFONT_TRANSPARENT); - XFONT_SetBkColor(xfont->debug_font, D3DCOLOR_ARGB(100,0,0,0)); - XFONT_SetTextHeight(xfont->debug_font, 14); - XFONT_SetTextAntialiasLevel(xfont->debug_font, - XFONT_GetTextAntialiasLevel(xfont->debug_font)); -#endif - - return xfont; -} - -static void xfonts_free(void *data, bool is_threaded) -{ - xfonts_t *font = (xfonts_t*)data; - - if (!font) - return; - - free(font); -} - -static void xfonts_render_msg( - void *userdata, - void *data, - const char *msg, - const struct font_params *params) -{ - float x, y; - wchar_t *wc = NULL; - xfonts_t *xfonts = (xfonts_t*)data; - settings_t *settings = config_get_ptr(); - float video_msg_pos_x = settings->floats.video_msg_pos_x; - float video_msg_pos_y = settings->floats.video_msg_pos_y; - LPDIRECT3DDEVICE8 dev = xfonts->d3d->dev; - - if (params) - { - x = params->x; - y = params->y; - } - else - { - x = video_msg_pos_x; - y = video_msg_pos_y; - } - - IDirect3DDevice8_GetBackBuffer(dev, -1, - D3DBACKBUFFER_TYPE_MONO, - (LPDIRECT3DSURFACE8*)&xfonts->surf); - - wc = utf8_to_utf16_string_alloc(msg); - - if (wc) - { -#ifdef __cplusplus - xfonts->debug_font->TextOut(xfonts->surf, - wc, (unsigned)-1, x, y); -#else - XFONT_TextOut(xfonts->debug_font, xfonts->surf, - wc, (unsigned)-1, x, y); -#endif - free(wc); - } - IDirect3DSurface8_Release((LPDIRECT3DSURFACE8)xfonts->surf); -} - -font_renderer_t d3d_xdk1_font = { - xfonts_init, - xfonts_free, - xfonts_render_msg, - "xdk1", - NULL, /* get_glyph */ - NULL, /* bind_block */ - NULL, /* flush */ - NULL, /* get_message_width */ - NULL /* get_line_metrics */ -}; diff --git a/gfx/font_driver.c b/gfx/font_driver.c index 5c1bcf37e4..4793aa75d4 100644 --- a/gfx/font_driver.c +++ b/gfx/font_driver.c @@ -156,9 +156,6 @@ static bool font_init_first( case FONT_DRIVER_RENDER_D3D8_API: { static const font_renderer_t *d3d8_font_backends[] = { -#if defined(_XBOX1) - &d3d_xdk1_font, -#endif NULL }; unsigned i; diff --git a/gfx/font_driver.h b/gfx/font_driver.h index e4fb532118..d4fa13aa00 100644 --- a/gfx/font_driver.h +++ b/gfx/font_driver.h @@ -115,7 +115,6 @@ int font_driver_get_line_centre_offset(font_data_t *font, float scale); extern font_renderer_t gl2_raster_font; extern font_renderer_t gl3_raster_font; extern font_renderer_t gl1_raster_font; -extern font_renderer_t d3d_xdk1_font; extern font_renderer_t d3d9x_win32_font; extern font_renderer_t ps2_font; extern font_renderer_t vita2d_vita_font; diff --git a/griffin/griffin.c b/griffin/griffin.c index 59819eb40f..3c194a3e2a 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -583,10 +583,6 @@ FONTS #include "../gfx/drivers_font_renderer/coretext.c" #endif -#if defined(_XBOX1) -#include "../gfx/drivers_font/xdk1_xfonts.c" -#endif - /*============================================================ INPUT ============================================================ */