MOve gfx_display and gfx_animation to gfx/

This commit is contained in:
twinaphex 2020-02-16 15:26:58 +01:00
parent c71469c715
commit 9a6ab81739
38 changed files with 88 additions and 86 deletions

View File

@ -808,7 +808,7 @@ ifeq ($(HAVE_SHADERS_COMMON), 1)
endif
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/gfx_display.o
OBJ += gfx/gfx_display.o
OBJ += menu/menu_driver.o \
menu/menu_setting.o \
menu/widgets/menu_filebrowser.o \
@ -834,7 +834,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/cbs/menu_cbs_down.o \
menu/cbs/menu_cbs_contentlist_switch.o \
menu/menu_displaylist.o \
menu/gfx_animation.o \
gfx/gfx_animation.o \
menu/drivers/menu_generic.o \
menu/menu_thumbnail_path.o \
menu/menu_thumbnail.o
@ -904,7 +904,7 @@ ifeq ($(HAVE_VITA2D), 1)
$(DEPS_DIR)/libvita2d/shader/texture_tint_f_gxp.o
ifeq ($(HAVE_MENU_COMMON),1)
OBJ += menu/drivers_display/gfx_display_vita2d.o
OBJ += gfx/drivers_display/gfx_display_vita2d.o
endif
OBJ += gfx/drivers/vita2d_gfx.o \
@ -915,7 +915,7 @@ endif
ifeq ($(TARGET), retroarch_3ds)
OBJ += gfx/drivers/ctr_gfx.o \
menu/drivers_display/gfx_display_ctr.o \
gfx/drivers_display/gfx_display_ctr.o \
input/drivers/ctr_input.o \
input/drivers_joypad/ctr_joypad.o
endif
@ -936,7 +936,7 @@ endif
ifeq ($(TARGET), retroarch_wiiu)
OBJ += gfx/drivers/gx2_gfx.o \
gfx/drivers_font/wiiu_font.o \
menu/drivers_display/gfx_display_wiiu.o \
gfx/drivers_display/gfx_display_wiiu.o \
input/drivers/wiiu_input.o \
input/drivers_joypad/wiiu_joypad.o \
input/drivers_joypad/wiiu/wpad_driver.o \
@ -961,7 +961,7 @@ endif
ifeq ($(TARGET), retroarch_switch)
ifeq ($(HAVE_LIBNX), 1)
OBJ += menu/drivers_display/gfx_display_switch.o \
OBJ += gfx/drivers_display/gfx_display_switch.o \
gfx/drivers/switch_nx_gfx.o \
audio/drivers/switch_libnx_audren_audio.o \
audio/drivers/switch_libnx_audren_thread_audio.o
@ -1167,7 +1167,7 @@ ifeq ($(HAVE_VITAGL), 1)
OBJ += gfx/drivers/gl1.o \
gfx/drivers_font/gl1_raster_font.o \
gfx/drivers_context/vita_ctx.o \
menu/drivers_display/gfx_display_gl1.o
gfx/drivers_display/gfx_display_gl1.o
endif
ifeq ($(HAVE_GL_CONTEXT), 1)
@ -1188,11 +1188,11 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
ifeq ($(HAVE_MENU_COMMON), 1)
ifeq ($(HAVE_GL_MODERN), 1)
OBJ += menu/drivers_display/gfx_display_gl.o
OBJ += gfx/drivers_display/gfx_display_gl.o
endif
ifeq ($(HAVE_OPENGL1), 1)
OBJ += menu/drivers_display/gfx_display_gl1.o
OBJ += gfx/drivers_display/gfx_display_gl1.o
endif
endif
@ -1244,7 +1244,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
gfx/drivers_font/metal_raster_font.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_metal.o
OBJ += gfx/drivers_display/gfx_display_metal.o
endif
endif
@ -1351,7 +1351,7 @@ ifeq ($(HAVE_VULKAN), 1)
OBJ += gfx/drivers_context/khr_display_ctx.o
endif
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_vulkan.o
OBJ += gfx/drivers_display/gfx_display_vulkan.o
endif
NEED_CXX_LINKER = 1
DEFINES += -DHAVE_VULKAN
@ -1363,7 +1363,7 @@ ifeq ($(HAVE_OPENGL_CORE), 1)
gfx/drivers_font/gl_core_raster_font.o \
gfx/drivers_shader/shader_gl_core.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_gl_core.o
OBJ += gfx/drivers_display/gfx_display_gl_core.o
endif
DEFINES += -DHAVE_OPENGL_CORE
@ -1433,7 +1433,7 @@ ifeq ($(HAVE_D3D10), 1)
gfx/common/d3d10_common.o \
gfx/drivers_font/d3d10_font.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_d3d10.o
OBJ += gfx/drivers_display/gfx_display_d3d10.o
endif
DEFINES += -DHAVE_D3D10
endif
@ -1444,7 +1444,7 @@ ifeq ($(HAVE_D3D11), 1)
gfx/common/d3d11_common.o \
gfx/drivers_font/d3d11_font.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_d3d11.o
OBJ += gfx/drivers_display/gfx_display_d3d11.o
endif
DEFINES += -DHAVE_D3D11
endif
@ -1455,7 +1455,7 @@ ifeq ($(HAVE_D3D12), 1)
gfx/common/d3d12_common.o \
gfx/drivers_font/d3d12_font.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_d3d12.o
OBJ += gfx/drivers_display/gfx_display_d3d12.o
endif
DEFINES += -DHAVE_D3D12
endif
@ -1496,7 +1496,7 @@ ifeq ($(HAVE_D3D8), 1)
OBJ += gfx/common/d3d8_common.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_d3d8.o
OBJ += gfx/drivers_display/gfx_display_d3d8.o
endif
endif
@ -1506,7 +1506,7 @@ ifeq ($(HAVE_D3D9), 1)
OBJ += gfx/common/d3d9_common.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_d3d9.o
OBJ += gfx/drivers_display/gfx_display_d3d9.o
endif
endif
@ -1982,7 +1982,7 @@ ifneq ($(findstring Win32,$(OS)),)
gfx/drivers_font/gdi_font.o
LIBS += -lmsimg32
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/gfx_display_gdi.o
OBJ += gfx/drivers_display/gfx_display_gdi.o
endif
endif
LIBS += -lhid -lsetupapi

View File

@ -392,7 +392,7 @@
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
#include "menu/gfx_animation.h"
#include "gfx/gfx_animation.h"
#ifdef HAVE_LIBNX
#define DEFAULT_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME true

View File

@ -22,9 +22,9 @@
#include "../gfx_display.h"
#include "../../retroarch.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/common/ctr_common.h"
#include "../../gfx/drivers/ctr_gu.h"
#include "../font_driver.h"
#include "../common/ctr_common.h"
#include "../drivers/ctr_gu.h"
#include "../../ctr/gpu_old.h"
static const float *gfx_display_ctr_get_default_vertices(void) { return NULL; }

View File

@ -25,8 +25,8 @@
#include "../gfx_display.h"
#include "../../retroarch.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/common/d3d10_common.h"
#include "../font_driver.h"
#include "../common/d3d10_common.h"
static const float* gfx_display_d3d10_get_default_vertices(void)
{

View File

@ -24,8 +24,8 @@
#include "../gfx_display.h"
#include "../../retroarch.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/common/d3d11_common.h"
#include "../font_driver.h"
#include "../common/d3d11_common.h"
static const float* gfx_display_d3d11_get_default_vertices(void)
{

View File

@ -24,8 +24,8 @@
#include "../gfx_display.h"
#include "../../retroarch.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/common/d3d12_common.h"
#include "../font_driver.h"
#include "../common/d3d12_common.h"
static const float* gfx_display_d3d12_get_default_vertices(void)
{

View File

@ -26,8 +26,8 @@
#include "../gfx_display.h"
#include "../../retroarch.h"
#include "../../gfx/common/d3d_common.h"
#include "../../gfx/common/d3d8_common.h"
#include "../common/d3d_common.h"
#include "../common/d3d8_common.h"
static const float d3d8_vertexes[] = {
0, 0,

View File

@ -26,8 +26,8 @@
#include "../gfx_display.h"
#include "../../retroarch.h"
#include "../../gfx/common/d3d_common.h"
#include "../../gfx/common/d3d9_common.h"
#include "../common/d3d_common.h"
#include "../common/d3d9_common.h"
static const float d3d9_vertexes[] = {
0, 0,

View File

@ -21,15 +21,15 @@
#include <retro_miscellaneous.h>
#include "../../config.def.h"
#include "../../gfx/font_driver.h"
#include "../font_driver.h"
#include "../../retroarch.h"
#include "../../verbosity.h"
#include "../gfx_display.h"
#if defined(_WIN32) && !defined(_XBOX)
#include "../../gfx/common/win32_common.h"
#include "../../gfx/common/gdi_common.h"
#include "../common/win32_common.h"
#include "../common/gdi_common.h"
#endif
static void *gfx_display_gdi_get_default_mvp(video_frame_info_t *video_info)

View File

@ -20,8 +20,8 @@
#endif
#include "../../retroarch.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/common/gl_common.h"
#include "../font_driver.h"
#include "../common/gl_common.h"
#include "../gfx_display.h"

View File

@ -21,10 +21,10 @@
#endif
#include "../../retroarch.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/common/gl1_common.h"
#include "../font_driver.h"
#include "../common/gl1_common.h"
#include "../menu_driver.h"
#include "../gfx_display.h"
#ifdef VITA
static float *vertices3 = NULL;

View File

@ -23,9 +23,9 @@
#include "../gfx_display.h"
#include "../../gfx/font_driver.h"
#include "../font_driver.h"
#include "../../retroarch.h"
#include "../../gfx/common/gl_core_common.h"
#include "../common/gl_core_common.h"
static const float gl_core_vertexes[] = {
0, 0,

View File

@ -21,9 +21,9 @@
#include "../gfx_display.h"
#include "../../gfx/font_driver.h"
#include "../font_driver.h"
#include "../../retroarch.h"
#import "../../gfx/common/metal_common.h"
#import "../common/metal_common.h"
static const float *gfx_display_metal_get_default_vertices(void)
{

View File

@ -17,7 +17,7 @@
#include <queues/message_queue.h>
#include <retro_miscellaneous.h>
#include "../../gfx/font_driver.h"
#include "../font_driver.h"
#include "../../retroarch.h"
#include "../gfx_display.h"

View File

@ -24,8 +24,8 @@
#include "../gfx_display.h"
#include "../../retroarch.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/common/vita2d_common.h"
#include "../font_driver.h"
#include "../common/vita2d_common.h"
#include "../../defines/psp_defines.h"
static const float vita2d_vertexes[] = {

View File

@ -22,9 +22,9 @@
#include "../gfx_display.h"
#include "../../gfx/font_driver.h"
#include "../font_driver.h"
#include "../../retroarch.h"
#include "../../gfx/common/vulkan_common.h"
#include "../common/vulkan_common.h"
/* Will do Y-flip later, but try to make it similar to GL. */
static const float vk_vertexes[] = {

View File

@ -23,8 +23,8 @@
#include "../gfx_display.h"
#include "../../retroarch.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/common/gx2_common.h"
#include "../font_driver.h"
#include "../common/gx2_common.h"
#include "../../wiiu/system/memory.h"
#include "../../wiiu/wiiu_dbg.h"

View File

@ -23,7 +23,7 @@
#include <boolean.h>
#include <retro_common_api.h>
#include "../gfx/font_driver.h"
#include "font_driver.h"
RETRO_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#include "../configuration.h"
#include "../frontend/frontend.h"
#include "../gfx/video_coord_array.h"
#include "video_coord_array.h"
#include "../verbosity.h"
#define PARTICLES_COUNT 100

View File

@ -1245,7 +1245,7 @@ MENU
#endif
#ifdef HAVE_MENU
#include "../menu/gfx_display.c"
#include "../gfx/gfx_display.c"
#include "../menu/menu_driver.c"
#include "../menu/menu_setting.c"
#include "../menu/menu_cbs.c"
@ -1279,67 +1279,67 @@ MENU
#include "../menu/cbs/menu_cbs_down.c"
#include "../menu/cbs/menu_cbs_contentlist_switch.c"
#include "../menu/menu_displaylist.c"
#include "../menu/gfx_animation.c"
#include "../gfx/gfx_animation.c"
#include "../menu/menu_thumbnail_path.c"
#include "../menu/menu_thumbnail.c"
#include "../menu/drivers/menu_generic.c"
#if defined(HAVE_D3D8)
#include "../menu/drivers_display/gfx_display_d3d8.c"
#include "../gfx/drivers_display/gfx_display_d3d8.c"
#endif
#if defined(HAVE_D3D9)
#include "../menu/drivers_display/gfx_display_d3d9.c"
#include "../gfx/drivers_display/gfx_display_d3d9.c"
#endif
#if defined(HAVE_D3D10)
#include "../menu/drivers_display/gfx_display_d3d10.c"
#include "../gfx/drivers_display/gfx_display_d3d10.c"
#endif
#if defined(HAVE_D3D11)
#include "../menu/drivers_display/gfx_display_d3d11.c"
#include "../gfx/drivers_display/gfx_display_d3d11.c"
#endif
#if defined(HAVE_D3D12)
#include "../menu/drivers_display/gfx_display_d3d12.c"
#include "../gfx/drivers_display/gfx_display_d3d12.c"
#endif
#ifdef HAVE_OPENGL1
#include "../menu/drivers_display/gfx_display_gl1.c"
#include "../gfx/drivers_display/gfx_display_gl1.c"
#endif
#ifdef HAVE_OPENGL
#include "../menu/drivers_display/gfx_display_gl.c"
#include "../gfx/drivers_display/gfx_display_gl.c"
#endif
#ifdef HAVE_OPENGL_CORE
#include "../menu/drivers_display/gfx_display_gl_core.c"
#include "../gfx/drivers_display/gfx_display_gl_core.c"
#endif
#ifdef HAVE_VULKAN
#include "../menu/drivers_display/gfx_display_vulkan.c"
#include "../gfx/drivers_display/gfx_display_vulkan.c"
#endif
#ifdef HAVE_VITA2D
#include "../menu/drivers_display/gfx_display_vita2d.c"
#include "../gfx/drivers_display/gfx_display_vita2d.c"
#endif
#ifdef _3DS
#include "../menu/drivers_display/gfx_display_ctr.c"
#include "../gfx/drivers_display/gfx_display_ctr.c"
#endif
#ifdef WIIU
#include "../menu/drivers_display/gfx_display_wiiu.c"
#include "../gfx/drivers_display/gfx_display_wiiu.c"
#endif
#if defined(HAVE_LIBNX)
#include "../menu/drivers_display/gfx_display_switch.c"
#include "../gfx/drivers_display/gfx_display_switch.c"
#endif
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
#ifdef HAVE_GDI
#include "../menu/drivers_display/gfx_display_gdi.c"
#include "../gfx/drivers_display/gfx_display_gdi.c"
#endif
#endif

View File

@ -74,6 +74,6 @@
#import "../gfx/common/metal/MenuDisplay.m"
#import "../gfx/common/metal_common.m"
#import "../gfx/drivers/metal.m"
#import "../menu/drivers_display/gfx_display_metal.m"
#import "../gfx/drivers_display/gfx_display_metal.m"
#import "../gfx/drivers_font/metal_raster_font.m"
#endif

View File

@ -23,7 +23,7 @@
#endif
#include "../menu_driver.h"
#include "../gfx_animation.h"
#include "../../gfx/gfx_animation.h"
#include "../menu_cbs.h"
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
#include "../menu_shader.h"

View File

@ -42,7 +42,7 @@
#include "menu_generic.h"
#include "../menu_driver.h"
#include "../gfx_animation.h"
#include "../../gfx/gfx_animation.h"
#include "../menu_input.h"
#include "../menu_thumbnail_path.h"
#include "../menu_thumbnail.h"

View File

@ -38,7 +38,8 @@
#include "../menu_generic.h"
#include "../../menu_driver.h"
#include "../../gfx_animation.h"
#include "../../../gfx/gfx_animation.h"
#include "../../../gfx/gfx_display.h"
#include "../../menu_input.h"
#include "../../playlist.h"
#include "../../runtime_file.h"

View File

@ -28,7 +28,7 @@
#include <features/features_cpu.h>
#include "../../menu_input.h"
#include "../../gfx_animation.h"
#include "../../../gfx/gfx_animation.h"
#include "../../widgets/menu_osk.h"

View File

@ -26,7 +26,7 @@
#include <encodings/utf.h>
#include "../../menu_driver.h"
#include "../../gfx_animation.h"
#include "../../../gfx/gfx_animation.h"
#include "../../../configuration.h"

View File

@ -27,7 +27,7 @@
#include <file/file_path.h>
#include <formats/image.h>
#include "../../gfx_animation.h"
#include "../../../gfx/gfx_animation.h"
#include "../../../configuration.h"

View File

@ -49,7 +49,7 @@
#include "menu_generic.h"
#include "../menu_driver.h"
#include "../gfx_animation.h"
#include "../../gfx/gfx_animation.h"
#include "../widgets/menu_osk.h"

View File

@ -42,7 +42,7 @@
#include "menu_generic.h"
#include "../menu_driver.h"
#include "../gfx_animation.h"
#include "../../gfx/gfx_animation.h"
#include "../menu_entries.h"
#include "../menu_input.h"

View File

@ -42,7 +42,7 @@
#include "menu_generic.h"
#include "../menu_driver.h"
#include "../gfx_animation.h"
#include "../../gfx/gfx_animation.h"
#include "../menu_entries.h"
#include "../menu_input.h"
#include "../menu_thumbnail_path.h"

View File

@ -34,7 +34,7 @@
#include "menu_generic.h"
#include "../menu_driver.h"
#include "../gfx_animation.h"
#include "../../gfx/gfx_animation.h"
#include "../menu_entries.h"
#include "../menu_input.h"
#include "../menu_setting.h"

View File

@ -32,7 +32,7 @@
#include "menu_defines.h"
#include "menu_input.h"
#include "menu_entries.h"
#include "gfx_display.h"
#include "../gfx/gfx_display.h"
#include "../gfx/font_driver.h"

View File

@ -67,7 +67,7 @@
#include "menu_setting.h"
#include "menu_cbs.h"
#include "menu_driver.h"
#include "gfx_animation.h"
#include "../gfx/gfx_animation.h"
#include "menu_input.h"
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
#include "menu_shader.h"

View File

@ -29,7 +29,7 @@
#include <file/file_path.h>
#include <string/stdstring.h>
#include "gfx_animation.h"
#include "../gfx/gfx_animation.h"
#include "menu_driver.h"
#include "menu_thumbnail.h"

View File

@ -38,8 +38,8 @@
#include "../../tasks/task_content.h"
#include "../../ui/ui_companion_driver.h"
#include "../gfx_animation.h"
#include "../gfx_display.h"
#include "../../gfx/gfx_animation.h"
#include "../../gfx/gfx_display.h"
#include "../menu_driver.h"
#include "../../gfx/font_driver.h"

View File

@ -133,7 +133,8 @@
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
#include "menu/gfx_animation.h"
#include "gfx/gfx_animation.h"
#include "gfx/gfx_display.h"
#include "menu/menu_input.h"
#include "menu/widgets/menu_dialog.h"
#include "menu/widgets/menu_input_bind_dialog.h"