From 31c7abce64ccc5f2ef7fa8a70a43bafcfe2f9812 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 22 Apr 2019 23:30:24 +0200 Subject: [PATCH] (MSVC 2003) Fonts now show up for GL --- gfx/font_driver.c | 69 ++++++++++---------- pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj | 4 +- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/gfx/font_driver.c b/gfx/font_driver.c index 1cd48c54d1..da53a56a2a 100644 --- a/gfx/font_driver.c +++ b/gfx/font_driver.c @@ -151,6 +151,37 @@ static bool d3d9_font_init_first( } #endif +#ifdef HAVE_OPENGL1 +static const font_renderer_t *gl1_font_backends[] = { + &gl1_raster_font, + NULL, +}; + +static bool gl1_font_init_first( + const void **font_driver, void **font_handle, + void *video_data, const char *font_path, + float font_size, bool is_threaded) +{ + unsigned i; + + for (i = 0; gl1_font_backends[i]; i++) + { + void *data = gl1_font_backends[i]->init( + video_data, font_path, font_size, + is_threaded); + + if (!data) + continue; + + *font_driver = gl1_font_backends[i]; + *font_handle = data; + return true; + } + + return false; +} +#endif + #if defined(HAVE_OPENGL) static const font_renderer_t *gl_font_backends[] = { &gl_raster_font, @@ -184,36 +215,6 @@ static bool gl_font_init_first( return false; } -#ifdef HAVE_OPENGL1 -static const font_renderer_t *gl1_font_backends[] = { - &gl1_raster_font, - NULL, -}; - -static bool gl1_font_init_first( - const void **font_driver, void **font_handle, - void *video_data, const char *font_path, - float font_size, bool is_threaded) -{ - unsigned i; - - for (i = 0; gl1_font_backends[i]; i++) - { - void *data = gl1_font_backends[i]->init( - video_data, font_path, font_size, - is_threaded); - - if (!data) - continue; - - *font_driver = gl1_font_backends[i]; - *font_handle = data; - return true; - } - - return false; -} -#endif #ifdef HAVE_OPENGL_CORE static const font_renderer_t *gl_core_font_backends[] = { @@ -688,15 +689,15 @@ static bool font_init_first( switch (api) { -#ifdef HAVE_OPENGL - case FONT_DRIVER_RENDER_OPENGL_API: - return gl_font_init_first(font_driver, font_handle, - video_data, font_path, font_size, is_threaded); #ifdef HAVE_OPENGL1 case FONT_DRIVER_RENDER_OPENGL1_API: return gl1_font_init_first(font_driver, font_handle, video_data, font_path, font_size, is_threaded); #endif +#ifdef HAVE_OPENGL + case FONT_DRIVER_RENDER_OPENGL_API: + return gl_font_init_first(font_driver, font_handle, + video_data, font_path, font_size, is_threaded); #ifdef HAVE_OPENGL_CORE case FONT_DRIVER_RENDER_OPENGL_CORE_API: return gl_core_font_init_first(font_driver, font_handle, diff --git a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj index 64b35deff4..4a69701f89 100644 --- a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj +++ b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\..\..\deps";"$(SolutionDir)\..\..\deps\stb";"$(SolutionDir)\..\..\deps\rcheevos\include";"$(SolutionDir)\..\..\gfx\include"" - PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETPLAYDISCOVERY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;HAVE_OPENGL1;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS" + PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETPLAYDISCOVERY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;HAVE_OPENGL1;HAVE_UPDATE_ASSETS;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -70,7 +70,7 @@