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

Merge remote-tracking branch 'upstream/master' into ios-cleanup

Browse Source
This commit is contained in:
Yoshi Sugawara 2019-02-03 09:00:22 -10:00
commit 1ca3bcf21d
29 changed files with 12 additions and 25063 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -55,7 +55,6 @@ DerivedData
apple/tmp
apple/*.mobileprovision
apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
menu/driverspzarch.c
/Cg/
/GL/
/SDL/

3
Makefile
View File

@ -254,9 +254,6 @@ install: $(TARGET)
@if test -d media/assets && test $(HAVE_ASSETS); then \
echo "Installing media assets..."; \
mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets; \
if test $(HAVE_ZARCH) = 1; then \
cp -r media/assets/zarch/ $(DESTDIR)$(ASSETS_DIR)/assets; \
fi; \
if test $(HAVE_MATERIALUI) = 1; then \
cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/assets; \
fi; \

11
Makefile.common
View File

@ -670,10 +670,6 @@ endif
# XMB and MaterialUI are always enabled if supported and not explicitly disabled
ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
ifeq ($(HAVE_ZARCH),)
HAVE_ZARCH = 0
endif
ifeq ($(HAVE_RGUI),)
HAVE_RGUI = 1
endif
@ -694,7 +690,6 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
HAVE_OZONE = 1
endif
else
HAVE_ZARCH ?= 0
HAVE_RGUI ?= 0
HAVE_MATERIALUI ?= 0
HAVE_XMB ?= 0
@ -717,12 +712,6 @@ ifeq ($(HAVE_MENU), 1)
HAVE_ASSETS = 1
endif
ifeq ($(HAVE_ZARCH), 1)
OBJ += menu/drivers/zarch.o
DEFINES += -DHAVE_ZARCH
HAVE_ASSETS = 1
endif
ifeq ($(HAVE_XMB), 1)
OBJ += menu/drivers/xmb.o
DEFINES += -DHAVE_XMB

1
Makefile.ctr
View File

@ -68,7 +68,6 @@ else
HAVE_7ZIP = 1
HAVE_BUILTINZLIB = 1
HAVE_LIBRETRODB = 1
HAVE_ZARCH = 0
HAVE_MATERIALUI = 1
HAVE_XMB = 1
HAVE_STATIC_VIDEO_FILTERS = 1

5
Makefile.libnx
View File

@ -56,18 +56,13 @@ HAVE_LANGEXTRA = 1
ifeq ($(HAVE_OPENGL), 1)
HAVE_EGL = 1
HAVE_SHADERPIPELINE = 1
HAVE_RGUI = 1
HAVE_MATERIALUI = 1
HAVE_XMB = 1
HAVE_OZONE = 1
HAVE_OVERLAY = 1
else
HAVE_RGUI = 1
HAVE_ZARCH = 0
HAVE_MATERIALUI = 0
HAVE_XMB = 0
HAVE_OZONE = 0

9
Makefile.orbis
View File

@ -30,18 +30,17 @@ else
HAVE_RBMP := 1
HAVE_RTGA := 1
HAVE_ZLIB := 1
HAVE_OVERLAY := 1
HAVE_OVERLAY := 1
HAVE_7ZIP := 1
HAVE_EGL := 1
HAVE_OPENGLES := 1
HAVE_OPENGLES := 1
HAVE_NETWORKING := 0
HAVE_SOCKET_LEGACY := 0
HAVE_MENU := 1
HAVE_MENU_COMMON := 1
HAVE_RGUI := 0
HAVE_MATERIALUI := 0
HAVE_XMB := 1
HAVE_ZARCH := 0
HAVE_MATERIALUI := 0
HAVE_XMB := 1
HAVE_THREADS := 1
HAVE_LIBRETRODB := 1
HAVE_CC_RESAMPLER := 1

1
Makefile.switch
View File

@ -24,7 +24,6 @@ else
HAVE_ZLIB = 1
HAVE_BUILTINZLIB = 1
HAVE_LIBRETRODB = 1
HAVE_ZARCH = 0
HAVE_MATERIALUI = 0 # enable later?
HAVE_XMB = 0
HAVE_STATIC_VIDEO_FILTERS = 1

1
Makefile.wiiu
View File

@ -122,7 +122,6 @@ endif
HAVE_7ZIP = 1
HAVE_BUILTINZLIB = 0
HAVE_LIBRETRODB = 1
HAVE_ZARCH = 0
HAVE_MATERIALUI = 1
HAVE_XMB = 1
HAVE_STB_FONT = 1

2
config.def.h
View File

@ -395,7 +395,7 @@ static bool default_screenshots_in_content_dir = false;
#if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360)
static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_L3_R3;
#elif defined(PS2)
#elif defined(PS2) || defined(PSP)
static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_HOLD_START;
#elif defined(VITA)
static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_L1_R1_START_SELECT;

3
configuration.c
View File

@ -300,7 +300,6 @@ enum menu_driver_enum
MENU_MATERIALUI,
MENU_XMB,
MENU_STRIPES,
MENU_NUKLEAR,
MENU_OZONE,
MENU_NULL
};
@ -1095,8 +1094,6 @@ const char *config_get_default_menu(void)
return "xmb";
case MENU_STRIPES:
return "stripes";
case MENU_NUKLEAR:
return "nuklear";
case MENU_NULL:
break;
}

23656
deps/nuklear/nuklear.h vendored
View File

File diff suppressed because it is too large Load Diff

33
file_path_special.c
View File

@ -164,39 +164,6 @@ void fill_pathname_application_special(char *s,
fill_pathname_basedir(s, path_get(RARCH_PATH_CONFIG), len);
}
break;
case APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_ICONS:
#ifdef HAVE_ZARCH
{
}
#endif
break;
case APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT:
#ifdef HAVE_ZARCH
{
char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
s1[0] = '\0';
fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH);
fill_pathname_join(s,
s1, "Roboto-Condensed.ttf", len);
free(s1);
}
#endif
break;
case APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH:
#ifdef HAVE_ZARCH
{
settings_t *settings = config_get_ptr();
fill_pathname_join(s,
settings->paths.directory_assets,
"zarch",
len);
}
#endif
break;
case APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS:
#ifdef HAVE_XMB
{

3
file_path_special.h
View File

@ -108,9 +108,6 @@ enum application_special_type
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_BG,
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS,
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT,
APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH,
APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT,
APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_ICONS,
APPLICATION_SPECIAL_DIRECTORY_ASSETS_OZONE,
APPLICATION_SPECIAL_DIRECTORY_ASSETS_SOUNDS,
APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES,

1
frontend/drivers/platform_emscripten.c
View File

@ -37,6 +37,7 @@
#include "../frontend.h"
#include "../frontend_driver.h"
#include "../../gfx/video_driver.h"
#include "../../configuration.h"
#include "../../defaults.h"
#include "../../content.h"

7
gfx/drivers/gl.c
View File

@ -2416,11 +2416,12 @@ static void gl_show_mouse(void *data, bool state)
static struct video_shader *gl_get_current_shader(void *data)
{
video_shader_ctx_t shader_info = {0};
gl_t *gl = (gl_t*)data;
video_shader_driver_direct_get_current_shader(&shader_info);
if (!gl)
return NULL;
return shader_info.data;
return gl->shader->get_current_shader(gl->shader_data);
}
#if defined(HAVE_MENU)

38
gfx/drivers/gl_shaders/pipeline_nuklear.cg.h
View File

@ -1,38 +0,0 @@
#include "shaders_common.h"
static const char *nuklear_shader = CG(
struct input
{
float time;
};
void main_vertex
(
float4 position : POSITION,
float4 color : COLOR,
float2 texCoord : TEXCOORD0,
uniform float4x4 modelViewProj,
out float4 oPosition : POSITION,
out float4 oColor : COLOR,
out float2 otexCoord : TEXCOORD
)
{
oPosition = mul(modelViewProj, position);
oColor = color;
otexCoord = texCoord;
}
struct output
{
float4 color : COLOR;
};
output main_fragment(float2 texCoord : TEXCOORD0, uniform sampler2D Texture : TEXUNIT0, uniform input IN)\
{
output OUT;
OUT.color = tex2D(Texture, texCoord);
return OUT;
}
);

13
gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h
View File

@ -1,13 +0,0 @@
#include "shaders_common.h"
static const char *nuklear_fragment_shader = GLSL_300(
precision mediump float;
uniform sampler2D Texture;
in vec2 Frag_UV;
in vec4 Frag_Color;
out vec4 Out_Color;
void main(){
Out_Color = Frag_Color * texture(Texture, Frag_UV.st);
}
);

17
gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h
View File

@ -1,17 +0,0 @@
#include "shaders_common.h"
static const char *nuklear_vertex_shader = GLSL_300(
uniform mat4 ProjMtx;
in vec2 Position;
in vec2 TexCoord;
in vec4 Color;
out vec2 Frag_UV;
out vec4 Frag_Color;
void main()
{
Frag_UV = TexCoord;
Frag_Color = Color;
gl_Position = ProjMtx * vec4(Position.xy, 0, 1);
}
);

2
gfx/video_crt_switch.c
View File

@ -29,7 +29,7 @@
#endif
#if defined(HAVE_VIDEOCORE)
#include "../include/userland/interface/vmcs_host/vc_vchi_gencmd.h"
#include "include/userland/interface/vmcs_host/vc_vchi_gencmd.h"
#endif
static unsigned ra_core_width = 0;

19
gfx/video_driver.c
View File

@ -3478,17 +3478,6 @@ bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader)
return true;
}
bool video_shader_driver_direct_get_current_shader(
video_shader_ctx_t *shader)
{
if (!current_shader)
return false;
shader->data = current_shader->get_current_shader(current_shader_data);
return true;
}
bool video_shader_driver_deinit(void)
{
if (!current_shader)
@ -3513,12 +3502,6 @@ static bool video_driver_cb_set_mvp(void *data,
return true;
}
static struct video_shader *
video_shader_driver_get_current_shader_null(void *data)
{
return NULL;
}
static void video_shader_driver_scale_null(void *data,
unsigned idx, struct gfx_fbo_scale *scale)
{
@ -3543,8 +3526,6 @@ static void video_shader_driver_reset_to_defaults(void)
if (!current_shader->shader_scale)
current_shader->shader_scale = video_shader_driver_scale_null;
if (!current_shader->get_current_shader)
current_shader->get_current_shader= video_shader_driver_get_current_shader_null;
}
/* Finds first suitable shader context driver. */

2
gfx/video_driver.h
View File

@ -1184,8 +1184,6 @@ bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident);
bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader);
bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader);
bool video_shader_driver_deinit(void);
bool video_shader_driver_init_first(void);

4
griffin/griffin.c
View File

@ -1307,10 +1307,6 @@ MENU
#include "../menu/drivers/materialui.c"
#endif
#ifdef HAVE_ZARCH
#include "../menu/drivers/zarch.c"
#endif
#endif
#ifdef HAVE_NETWORKGAMEPAD

1
input/drivers/rwebinput_input.c
View File

@ -29,6 +29,7 @@
#include "../input_driver.h"
#include "../input_keymaps.h"
#include "../../gfx/video_driver.h"
#include "../../tasks/tasks_internal.h"
#include "../../configuration.h"
#include "../../verbosity.h"

1212
menu/drivers/zarch.c
View File

File diff suppressed because it is too large Load Diff

3
menu/menu_driver.c
View File

@ -102,9 +102,6 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
#endif
#if defined(HAVE_XUI)
&menu_ctx_xui,
#endif
#if defined(HAVE_ZARCH)
&menu_ctx_zarch,
#endif
&menu_ctx_null,
NULL

2
menu/menu_driver.h
View File

@ -693,10 +693,8 @@ extern menu_ctx_driver_t menu_ctx_ozone;
extern menu_ctx_driver_t menu_ctx_xui;
extern menu_ctx_driver_t menu_ctx_rgui;
extern menu_ctx_driver_t menu_ctx_mui;
extern menu_ctx_driver_t menu_ctx_nuklear;
extern menu_ctx_driver_t menu_ctx_xmb;
extern menu_ctx_driver_t menu_ctx_stripes;
extern menu_ctx_driver_t menu_ctx_zarch;
extern menu_ctx_driver_t menu_ctx_null;
RETRO_END_DECLS

23
pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
View File

@ -202,9 +202,7 @@
05A8C53A20DB72F000FF7857 /* nk_menu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nk_menu.h; sourceTree = "<group>"; };
05A8C53B20DB72F000FF7857 /* xui.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = xui.cpp; sourceTree = "<group>"; };
05A8C53C20DB72F000FF7857 /* rgui.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = rgui.c; sourceTree = "<group>"; };
05A8C53D20DB72F000FF7857 /* nuklear.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = nuklear.c; sourceTree = "<group>"; };
05A8C53E20DB72F000FF7857 /* null.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = null.c; sourceTree = "<group>"; };
05A8C53F20DB72F000FF7857 /* zarch.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = zarch.c; sourceTree = "<group>"; };
05A8C54020DB72F000FF7857 /* materialui.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = materialui.c; sourceTree = "<group>"; };
05A8C54120DB72F000FF7857 /* menu_cbs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_cbs.c; sourceTree = "<group>"; };
05A8C54220DB72F000FF7857 /* menu_networking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = menu_networking.h; sourceTree = "<group>"; };
@ -318,11 +316,8 @@
05A8C60A20DB72F000FF7857 /* core_alpha_blend.glsl.frag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = core_alpha_blend.glsl.frag.h; sourceTree = "<group>"; };
05A8C60B20DB72F000FF7857 /* modern_alpha_blend.glsl.vert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = modern_alpha_blend.glsl.vert.h; sourceTree = "<group>"; };
05A8C60C20DB72F000FF7857 /* opaque.cg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = opaque.cg.h; sourceTree = "<group>"; };
05A8C60D20DB72F000FF7857 /* pipeline_nuklear.cg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pipeline_nuklear.cg.h; sourceTree = "<group>"; };
05A8C60E20DB72F000FF7857 /* pipeline_nuklear.glsl.vert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pipeline_nuklear.glsl.vert.h; sourceTree = "<group>"; };
05A8C60F20DB72F000FF7857 /* modern_opaque.glsl.vert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = modern_opaque.glsl.vert.h; sourceTree = "<group>"; };
05A8C61020DB72F000FF7857 /* modern_opaque.glsl.frag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = modern_opaque.glsl.frag.h; sourceTree = "<group>"; };
05A8C61120DB72F000FF7857 /* pipeline_nuklear.glsl.frag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pipeline_nuklear.glsl.frag.h; sourceTree = "<group>"; };
05A8C61220DB72F000FF7857 /* modern_pipeline_snow.glsl.vert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = modern_pipeline_snow.glsl.vert.h; sourceTree = "<group>"; };
05A8C61320DB72F000FF7857 /* pipeline_snowflake.glsl.frag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pipeline_snowflake.glsl.frag.h; sourceTree = "<group>"; };
05A8C61420DB72F000FF7857 /* modern_pipeline_xmb_ribbon.glsl.vert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = modern_pipeline_xmb_ribbon.glsl.vert.h; sourceTree = "<group>"; };
@ -828,34 +823,19 @@
05A8C53120DB72F000FF7857 /* drivers */ = {
isa = PBXGroup;
children = (
05A8C53520DB72F000FF7857 /* nuklear */,
05132C6521A74D5100379846 /* ozone */,
05A8C54020DB72F000FF7857 /* materialui.c */,
05A8C53420DB72F000FF7857 /* menu_generic.c */,
05A8C53320DB72F000FF7857 /* menu_generic.h */,
05A8C53D20DB72F000FF7857 /* nuklear.c */,
05A8C53E20DB72F000FF7857 /* null.c */,
05A8C53C20DB72F000FF7857 /* rgui.c */,
05EFAFC22191D64200D27059 /* stripes.c */,
05A8C53220DB72F000FF7857 /* xmb.c */,
05A8C53B20DB72F000FF7857 /* xui.cpp */,
05A8C53F20DB72F000FF7857 /* zarch.c */,
);
path = drivers;
sourceTree = "<group>";
};
05A8C53520DB72F000FF7857 /* nuklear */ = {
isa = PBXGroup;
children = (
05A8C53620DB72F000FF7857 /* nk_common.h */,
05A8C53720DB72F000FF7857 /* nk_menu.c */,
05A8C53820DB72F000FF7857 /* nk_wnd_debug.c */,
05A8C53920DB72F000FF7857 /* nk_common.c */,
05A8C53A20DB72F000FF7857 /* nk_menu.h */,
);
path = nuklear;
sourceTree = "<group>";
};
05A8C55220DB72F000FF7857 /* widgets */ = {
isa = PBXGroup;
children = (
@ -1079,11 +1059,8 @@
05A8C60A20DB72F000FF7857 /* core_alpha_blend.glsl.frag.h */,
05A8C60B20DB72F000FF7857 /* modern_alpha_blend.glsl.vert.h */,
05A8C60C20DB72F000FF7857 /* opaque.cg.h */,
05A8C60D20DB72F000FF7857 /* pipeline_nuklear.cg.h */,
05A8C60E20DB72F000FF7857 /* pipeline_nuklear.glsl.vert.h */,
05A8C60F20DB72F000FF7857 /* modern_opaque.glsl.vert.h */,
05A8C61020DB72F000FF7857 /* modern_opaque.glsl.frag.h */,
05A8C61120DB72F000FF7857 /* pipeline_nuklear.glsl.frag.h */,
05A8C61220DB72F000FF7857 /* modern_pipeline_snow.glsl.vert.h */,
05A8C61320DB72F000FF7857 /* pipeline_snowflake.glsl.frag.h */,
05A8C61420DB72F000FF7857 /* modern_pipeline_xmb_ribbon.glsl.vert.h */,

1
qb/config.libs.sh
View File

@ -496,7 +496,6 @@ if [ "$HAVE_MENU" != 'no' ]; then
HAVE_OZONE=no
HAVE_XMB=no
HAVE_STRIPES=no
HAVE_ZARCH=no
fi
die : 'Notice: Hardware rendering context not available.'
fi

1
qb/config.params.sh
View File

@ -14,7 +14,6 @@ HAVE_MATERIALUI=auto # MaterialUI menu
HAVE_XMB=auto # XMB menu
HAVE_OZONE=auto # Ozone menu
HAVE_STRIPES=no # Stripes menu
HAVE_ZARCH=no # Zarch menu
HAVE_RUNAHEAD=yes # Runahead support
HAVE_SSL=auto # SSL/mbedtls support
C89_SSL=no