libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-18 00:18:22 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Revert "(PS3) Added HAVE_LIBDBGFONTS define for PS3 port"

Browse Source 
This reverts commit 06bb45a856040b6ea63fd8786876be6c05a7b9c3.
This commit is contained in:
Twinaphex 2012-05-25 21:39:59 +02:00
parent f248d8b54a
commit 3649376c03
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.ps3
View File

@ -68,7 +68,7 @@ endif
PPU_LDLIBS = -ldbgfont $(GL_LIBS) -lretro -lcgc -lgcm_cmd -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread
DEFINES += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_LIBDBGFONTS -DHAVE_CG -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
DEFINES += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_CG -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
ifeq ($(DEBUG), 1)
PPU_OPTIMIZE_LV := -O0 -g

8
ps3/ps3_video_psgl.c
View File

@ -656,7 +656,7 @@ static void ps3graphics_set_orientation(void * data, uint32_t orientation)
glVertexPointer(2, GL_FLOAT, 0, vertex_ptr);
}
#ifdef HAVE_LIBDBGFONTS
#ifdef HAVE_LIBDBGFONT
static void gl_render_msg(gl_t *gl, const char *msg)
{
cellDbgFontPrintf(g_settings.video.msg_pos_x, g_settings.video.msg_pos_y, 1.11f, BLUE, msg);
@ -877,9 +877,7 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
static void psgl_deinit(gl_t *gl)
{
#ifdef HAVE_LIBDBGFONTS
cellDbgFontExit();
#endif
psglDestroyContext(gl->gl_context);
psglDestroyDevice(gl->gl_device);
@ -981,7 +979,6 @@ static bool psgl_init_device(gl_t *gl, const video_info_t *video, uint32_t resol
return true;
}
#ifdef HAVE_LIBDBGFONTS
static void psgl_init_dbgfont(gl_t *gl)
{
CellDbgFontConfig cfg;
@ -991,7 +988,6 @@ static void psgl_init_dbgfont(gl_t *gl)
cfg.screenHeight = gl->win_height;
cellDbgFontInit(&cfg);
}
#endif
static void *gl_init(const video_info_t *video, const input_driver_t **input, void **input_data)
{
@ -1014,10 +1010,8 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
RARCH_LOG("GL: Using resolution %ux%u.\n", gl->win_width, gl->win_height);
#ifdef HAVE_LIBDBGFONTS
RARCH_LOG("GL: Initializing debug fonts...\n");
psgl_init_dbgfont(gl);
#endif
RARCH_LOG("Initializing menu shader...\n");
gl_cg_set_menu_shader(DEFAULT_MENU_SHADER_FILE);