mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 01:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from MrHuu/ctr_gfx_widgets

Browse Source 
(3DS) Add HAVE_GFX_WIDGETS
This commit is contained in:
Autechre 2021-03-23 23:41:37 +01:00 committed by GitHub
commit 1a263586e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions

1
Makefile.ctr

@ -58,6 +58,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
DEFINES += -DHAVE_SCREENSHOTS DEFINES += -DHAVE_SCREENSHOTS
DEFINES += -DHAVE_REWIND DEFINES += -DHAVE_REWIND
DEFINES += -DHAVE_THREADS DEFINES += -DHAVE_THREADS
#DEFINES += -DHAVE_GFX_WIDGETS
#DEFINES += -DHAVE_SOCKET_LEGACY #DEFINES += -DHAVE_SOCKET_LEGACY
#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL #-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file #ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file

29
gfx/drivers/ctr_gfx.c

@ -30,6 +30,9 @@
#ifdef HAVE_MENU #ifdef HAVE_MENU
#include "../../menu/menu_driver.h" #include "../../menu/menu_driver.h"
#endif #endif
#ifdef HAVE_GFX_WIDGETS
#include "../gfx_widgets.h"
#endif
#include "../font_driver.h" #include "../font_driver.h"
#include "../../ctr/gpu_old.h" #include "../../ctr/gpu_old.h"
@ -560,6 +563,9 @@ static bool ctr_frame(void* data, const void* frame,
#ifdef HAVE_MENU #ifdef HAVE_MENU
bool menu_is_alive = video_info->menu_is_alive; bool menu_is_alive = video_info->menu_is_alive;
#endif #endif
#ifdef HAVE_GFX_WIDGETS
bool widgets_active = video_info->widgets_active;
#endif
if (!width || !height || !settings) if (!width || !height || !settings)
{ {
@ -889,6 +895,11 @@ static bool ctr_frame(void* data, const void* frame,
} }
#endif #endif
#ifdef HAVE_GFX_WIDGETS
if (widgets_active)
gfx_widgets_frame(video_info);
#endif
if (msg) if (msg)
font_driver_render_msg(ctr, msg, NULL, NULL); font_driver_render_msg(ctr, msg, NULL, NULL);
@ -1286,7 +1297,7 @@ static const video_poke_interface_t ctr_poke_interface = {
ctr_apply_state_changes, ctr_apply_state_changes,
ctr_set_texture_frame, ctr_set_texture_frame,
ctr_set_texture_enable, ctr_set_texture_enable,
ctr_set_osd_msg, font_driver_render_msg, /* ctr_set_osd_msg*/
NULL, /* show_mouse */ NULL, /* show_mouse */
NULL, /* grab_mouse_toggle */ NULL, /* grab_mouse_toggle */
NULL, /* get_current_shader */ NULL, /* get_current_shader */
@ -1301,6 +1312,14 @@ static void ctr_get_poke_interface(void* data,
*iface = &ctr_poke_interface; *iface = &ctr_poke_interface;
} }
#ifdef HAVE_GFX_WIDGETS
static bool ctr_gfx_widgets_enabled(void *data)
{
(void)data;
return true;
}
#endif
static bool ctr_set_shader(void* data, static bool ctr_set_shader(void* data,
enum rarch_shader_type type, const char* path) enum rarch_shader_type type, const char* path)
{ {
@ -1332,7 +1351,11 @@ video_driver_t video_ctr =
NULL, NULL,
#endif #endif
#ifdef HAVE_VIDEO_LAYOUT #ifdef HAVE_VIDEO_LAYOUT
NULL, NULL,
#endif
ctr_get_poke_interface,
NULL,
#ifdef HAVE_GFX_WIDGETS
ctr_gfx_widgets_enabled
#endif #endif
ctr_get_poke_interface
}; };