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

Add HAVE_OVERLAY to qb system

Browse Source
This commit is contained in:
twinaphex 2018-01-05 16:10:34 +01:00
parent 8ca98e0a18
commit f677a7ad7e
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -20,7 +20,7 @@ OBJDIR := obj-unix
OBJ := OBJ :=
LIBS := LIBS :=
DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL
DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"' DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
ifneq ($(findstring BSD,$(OS)),) ifneq ($(findstring BSD,$(OS)),)

7
Makefile.common
View File

@ -200,7 +200,6 @@ OBJ += frontend/frontend.o \
input/input_driver.o \ input/input_driver.o \
led/led_driver.o \ led/led_driver.o \
led/null_led_driver.o \ led/null_led_driver.o \
led/overlay_led_driver.o \
gfx/video_coord_array.o \ gfx/video_coord_array.o \
gfx/video_display_server.o \ gfx/video_display_server.o \
gfx/video_driver.o \ gfx/video_driver.o \
@ -220,8 +219,6 @@ OBJ += frontend/frontend.o \
input/input_autodetect_builtin.o \ input/input_autodetect_builtin.o \
input/input_keymaps.o \ input/input_keymaps.o \
input/input_remapping.o \ input/input_remapping.o \
tasks/task_overlay.o \
input/input_overlay.o \
$(LIBRETRO_COMM_DIR)/queues/fifo_queue.o \ $(LIBRETRO_COMM_DIR)/queues/fifo_queue.o \
managers/core_option_manager.o \ managers/core_option_manager.o \
$(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.o \ $(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.o \
@ -796,6 +793,10 @@ endif
ifeq ($(HAVE_OVERLAY), 1) ifeq ($(HAVE_OVERLAY), 1)
DEFINES += -DHAVE_OVERLAY DEFINES += -DHAVE_OVERLAY
OBJ += \
tasks/task_overlay.o \
input/input_overlay.o \
led/overlay_led_driver.o
endif endif
ifeq ($(HAVE_STB_FONT), 1) ifeq ($(HAVE_STB_FONT), 1)

4
gfx/drivers/vulkan.c
View File

@ -932,7 +932,9 @@ static void vulkan_free(void *data)
font_driver_free_osd(); font_driver_free_osd();
vulkan_deinit_static_resources(vk); vulkan_deinit_static_resources(vk);
#ifdef HAVE_OVERLAY
vulkan_overlay_free(vk); vulkan_overlay_free(vk);
#endif
if (vk->filter_chain) if (vk->filter_chain)
vulkan_filter_chain_free((vulkan_filter_chain_t*)vk->filter_chain); vulkan_filter_chain_free((vulkan_filter_chain_t*)vk->filter_chain);
@ -2610,8 +2612,6 @@ video_driver_t video_vulkan = {
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
vulkan_get_overlay_interface, vulkan_get_overlay_interface,
#else
NULL,
#endif #endif
vulkan_get_poke_interface, vulkan_get_poke_interface,
NULL, /* vulkan_wrap_type_to_enum */ NULL, /* vulkan_wrap_type_to_enum */

12
led/led_driver.c
View File

@ -20,11 +20,6 @@
#include "../verbosity.h" #include "../verbosity.h"
static led_driver_t *current_led_driver = NULL; static led_driver_t *current_led_driver = NULL;
extern led_driver_t *null_led_driver;
extern led_driver_t *overlay_led_driver;
#if HAVE_RPILED
extern led_driver_t *rpi_led_driver;
#endif
bool led_driver_init(void) bool led_driver_init(void)
{ {
@ -36,14 +31,15 @@ bool led_driver_init(void)
current_led_driver = null_led_driver; current_led_driver = null_led_driver;
#ifdef HAVE_OVERLAY
if(string_is_equal("overlay",drivername)) if(string_is_equal("overlay",drivername))
current_led_driver = overlay_led_driver; current_led_driver = overlay_led_driver;
#endif
#if HAVE_RPILED #if HAVE_RPILED
else if(string_is_equal("rpi", drivername)) if(string_is_equal("rpi", drivername))
current_led_driver = rpi_led_driver; current_led_driver = rpi_led_driver;
#endif #endif
else
current_led_driver = null_led_driver;
RARCH_LOG("[LED]: LED driver = '%s' %p\n", RARCH_LOG("[LED]: LED driver = '%s' %p\n",
drivername,current_led_driver); drivername,current_led_driver);

1
led/led_driver.h
View File

@ -42,6 +42,7 @@ void led_driver_free(void);
void led_driver_set_led(int led,int value); void led_driver_set_led(int led,int value);
extern led_driver_t *null_led_driver; extern led_driver_t *null_led_driver;
extern led_driver_t *overlay_led_driver;
extern led_driver_t *rpi_led_driver; extern led_driver_t *rpi_led_driver;
RETRO_END_DECLS RETRO_END_DECLS

1
qb/config.params.sh
View File

@ -11,6 +11,7 @@ HAVE_MATERIALUI=auto # MaterialUI menu
HAVE_XMB=auto # XMB menu HAVE_XMB=auto # XMB menu
HAVE_ZARCH=no # Zarch menu HAVE_ZARCH=no # Zarch menu
HAVE_NUKLEAR=no # Nuklear menu HAVE_NUKLEAR=no # Nuklear menu
HAVE_OVERLAY=yes # Overlay support
HAVE_DYNAMIC=yes # Dynamic loading of libretro library HAVE_DYNAMIC=yes # Dynamic loading of libretro library
HAVE_SDL=auto # SDL support HAVE_SDL=auto # SDL support
C89_SDL=no C89_SDL=no