Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-06-02 19:57:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of unused code libdbgfont

Browse source
This commit is contained in:
twinaphex 2019-08-13 11:42:46 +02:00
parent 82d8f180c9
commit 558e50b5a0
8 changed files with 0 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.ps3
View file

@ -94,9 +94,6 @@ endif
ifeq ($(HAVE_FREETYPE), 1)
DEFINES += -DHAVE_FREETYPE
FONT_LIBS := -lfontFT_stub -lfreetype_stub
else
#DEFINES += -DHAVE_LIBDBGFONT
#FONT_LIBS := -ldbgfont
endif
ifeq ($(CELL_BUILD_TOOLS), SNC)

3
Makefile.ps3.cobra
View file

@ -85,9 +85,6 @@ endif
ifeq ($(HAVE_FREETYPE), 1)
DEFINES += -DHAVE_FREETYPE
FONT_LIBS := -lfontFT_stub -lfreetype_stub
else
DEFINES += -DHAVE_LIBDBGFONT
FONT_LIBS := -ldbgfont
endif
ifeq ($(CELL_BUILD_TOOLS), SNC)

4
config.def.h
View file

@ -518,11 +518,7 @@ static unsigned input_backtouch_toggle = false;
#define DEFAULT_CROP_OVERSCAN true
/* Font size for on-screen messages. */
#if defined(HAVE_LIBDBGFONT)
#define DEFAULT_FONT_SIZE 1.0f
#else
#define DEFAULT_FONT_SIZE 32
#endif
/* Offset for where messages will be placed on-screen.
* Values are in range [0.0, 1.0]. */

9
gfx/drivers_context/ps3_ctx.c
View file

@ -24,12 +24,6 @@
#include <sys/spu_initialize.h>
#endif
#ifdef HAVE_LIBDBGFONT
#ifndef __PSL1GHT__
#include <cell/dbgfont.h>
#endif
#endif
#include <compat/strl.h>
#include "../../configuration.h"
@ -183,9 +177,6 @@ static bool gfx_ctx_ps3_suppress_screensaver(void *data, bool enable)
static void gfx_ctx_ps3_swap_buffers(void *data, void *data2)
{
(void)data;
#ifdef HAVE_LIBDBGFONT
cellDbgFontDraw();
#endif
#ifdef HAVE_PSGL
psglSwap();
#endif

112
gfx/drivers_font/ps_libdbgfont.c
View file

@ -1,112 +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 <http://www.gnu.org/licenses/>.
*/
#if defined(SN_TARGET_PSP2)
#include <libdbgfont.h>
#define DbgFontPrint(x, y, scale, color, msg) sceDbgFontPrint(x, y, color, msg)
#define DbgFontConfig SceDbgFontConfig
#define DbgFontInit sceDbgFontInit
#define DbgFontExit sceDbgFontExit
#elif defined(__CELLOS_LV2__)
#include <cell/dbgfont.h>
#define SCE_DBGFONT_BUFSIZE_LARGE 2048
#define DbgFontPrint(x, y, scale, color, msg) cellDbgFontPrintf(x, y, scale, color, msg)
#define DbgFontConfig CellDbgFontConfig
#define DbgFontInit cellDbgFontInit
#define DbgFontExit cellDbgFontExit
#endif
#include "../font_driver.h"
static void *libdbg_font_init_font(void *gl_data, const char *font_path,
float font_size, bool is_threaded)
{
unsigned width, height;
video_driver_get_size(&width, &height);
(void)font_path;
(void)font_size;
(void)width;
(void)height;
DbgFontConfig cfg;
#if defined(SN_TARGET_PSP2)
cfg.fontSize = SCE_DBGFONT_FONTSIZE_LARGE;
#elif defined(__CELLOS_LV2__)
cfg.bufSize = SCE_DBGFONT_BUFSIZE_LARGE;
cfg.screenWidth = width;
cfg.screenHeight = height;
#endif
DbgFontInit(&cfg);
/* Doesn't need any state. */
return (void*)-1;
}
static void libdbg_font_free_font(void *data, bool is_threaded)
{
(void)data;
DbgFontExit();
}
static void libdbg_font_render_msg(
video_frame_info_t *video_info,
void *data, const char *msg,
const struct font_params *params)
{
float x, y, scale;
unsigned color;
if (params)
{
x = params->x;
y = params->y;
scale = params->scale;
color = params->color;
}
else
{
x = video_info->font_msg_pos_x;
y = 0.90f;
scale = 1.04f;
color = SILVER;
}
DbgFontPrint(x, y, scale, color, msg);
if (!params)
DbgFontPrint(x, y, scale - 0.01f, WHITE, msg);
#ifdef SN_TARGET_PSP2
/* FIXME - if we ever get around to this port,
* move this out to some better place */
sceDbgFontFlush();
#endif
}
font_renderer_t libdbg_font = {
libdbg_font_init_font,
libdbg_font_free_font,
libdbg_font_render_msg,
"libdbgfont",
NULL, /* get_glyph */
NULL, /* bind_block */
NULL, /* flush */
NULL, /* get_message_width */
};

3
gfx/font_driver.c
View file

@ -187,9 +187,6 @@ static bool gl1_font_init_first(
#if defined(HAVE_OPENGL)
static const font_renderer_t *gl_font_backends[] = {
&gl_raster_font,
#if defined(HAVE_LIBDBGFONT)
&libdbg_font,
#endif
NULL,
};

1
gfx/font_driver.h
View file

@ -162,7 +162,6 @@ int font_driver_get_line_height(void *font_data, float scale);
extern font_renderer_t gl_raster_font;
extern font_renderer_t gl_core_raster_font;
extern font_renderer_t gl1_raster_font;
extern font_renderer_t libdbg_font;
extern font_renderer_t d3d_xbox360_font;
extern font_renderer_t d3d_xdk1_font;
extern font_renderer_t d3d_win32_font;

4
griffin/griffin.c
View file

@ -516,10 +516,6 @@ FONTS
#include "../gfx/drivers_font_renderer/coretext.c"
#endif
#if defined(HAVE_LIBDBGFONT)
#include "../gfx/drivers_font/ps_libdbgfont.c"
#endif
#ifdef HAVE_OPENGL1
#include "../gfx/drivers_font/gl1_raster_font.c"
#endif