From c8b041ef7df547f1eed949dfcb1d67ae78e7d460 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 14 Sep 2015 22:44:39 +0200 Subject: [PATCH 001/311] Simplify core_info_list_get_all_extensions --- core_info.c | 10 ++++++---- core_info.h | 2 +- dir_list_special.c | 3 +-- menu/cbs/menu_cbs_deferred_push.c | 14 +++++++------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/core_info.c b/core_info.c index 1f748ba46a..47c70ba345 100644 --- a/core_info.c +++ b/core_info.c @@ -460,11 +460,13 @@ bool core_info_does_support_file(const core_info_t *core, const char *path) core->supported_extensions_list, ".", path_get_extension(path)); } -const char *core_info_list_get_all_extensions(core_info_list_t *core_info_list) +const char *core_info_list_get_all_extensions(void) { - if (!core_info_list) - return ""; - return core_info_list->all_ext; + global_t *global = global_get_ptr(); + core_info_list_t *list = (global->core_info.list) ? global->core_info.list : NULL; + if (!list) + return NULL; + return list->all_ext; } /* qsort_r() is not in standard C, sadly. */ diff --git a/core_info.h b/core_info.h index f223a435bf..d76c2c8ba1 100644 --- a/core_info.h +++ b/core_info.h @@ -99,7 +99,7 @@ void core_info_list_update_missing_firmware(core_info_list_t *list, bool core_info_list_get_info(core_info_list_t *list, core_info_t *info, const char *path); -const char *core_info_list_get_all_extensions(core_info_list_t *list); +const char *core_info_list_get_all_extensions(void); bool core_info_list_get_display_name(core_info_list_t *list, const char *path, char *buf, size_t size); diff --git a/dir_list_special.c b/dir_list_special.c index 463359c43b..1270ef58d4 100644 --- a/dir_list_special.c +++ b/dir_list_special.c @@ -25,7 +25,6 @@ struct string_list *dir_list_new_special(const char *input_dir, enum dir_list_ty const char *exts = NULL; bool include_dirs = false; - global_t *global = global_get_ptr(); settings_t *settings = config_get_ptr(); (void)input_dir; @@ -39,7 +38,7 @@ struct string_list *dir_list_new_special(const char *input_dir, enum dir_list_ty break; case DIR_LIST_CORE_INFO: dir = input_dir; - exts = (global->core_info.list) ? core_info_list_get_all_extensions(global->core_info.list) : NULL; + exts = core_info_list_get_all_extensions(); break; case DIR_LIST_SHADERS: dir = settings->video.shader_dir; diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 5ca18595fa..338ca42c27 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -306,7 +306,8 @@ static int general_push(menu_displaylist_info_t *info, unsigned id, unsigned typ settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); rarch_system_info_t *system = rarch_system_info_get_ptr(); - menu_handle_t *menu = menu_driver_get_ptr(); + menu_handle_t *menu = menu_driver_get_ptr(); + const char *exts = core_info_list_get_all_extensions(); switch (id) { @@ -327,9 +328,9 @@ static int general_push(menu_displaylist_info_t *info, unsigned id, unsigned typ { case PUSH_ARCHIVE_OPEN_DETECT_CORE: info->setting = menu_setting_find(info->label); - if (global->core_info.list) - strlcpy(info->exts, core_info_list_get_all_extensions( - global->core_info.list), sizeof(info->exts)); + + if (exts) + strlcpy(info->exts, exts, sizeof(info->exts)); else if (global->menu.info.valid_extensions) { if (*global->menu.info.valid_extensions) @@ -363,9 +364,8 @@ static int general_push(menu_displaylist_info_t *info, unsigned id, unsigned typ strlcpy(info->exts, system->valid_extensions, sizeof(info->exts)); break; case PUSH_DETECT_CORE_LIST: - if (global->core_info.list) - strlcpy(info->exts, core_info_list_get_all_extensions( - global->core_info.list), sizeof(info->exts)); + if (exts) + strlcpy(info->exts, exts, sizeof(info->exts)); break; } From 3dfa505bf28ddac4b42164f521f26e47d7c9f39d Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 14 Sep 2015 23:39:00 +0200 Subject: [PATCH 002/311] (file_ops.c) Prevent warning --- file_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file_ops.c b/file_ops.c index 3fadbbaccf..4a10d5bd7e 100644 --- a/file_ops.c +++ b/file_ops.c @@ -654,7 +654,7 @@ bool write_file(const char *path, const void *data, ssize_t size) static int read_generic_file(const char *path, void **buf, ssize_t *len) { size_t bytes_read = 0; - size_t content_buf_size = 0; + ssize_t content_buf_size = 0; void *content_buf = NULL; FILE *file = fopen(path, "rb"); @@ -665,7 +665,7 @@ static int read_generic_file(const char *path, void **buf, ssize_t *len) goto error; content_buf_size = ftell(file); - if (content_buf_size < 0) + if (content_buf_size == -1) goto error; rewind(file); From 08f5db24b420ef85b57785411de057087f368495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Tue, 15 Sep 2015 00:12:10 +0200 Subject: [PATCH 003/311] (Vita) vita2d updated --- Makefile.griffin | 4 ++-- gfx/drivers/vita2d_gfx.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.griffin b/Makefile.griffin index ffdc147432..c462d9b07d 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -202,10 +202,10 @@ else ifeq ($(platform), vita) EXT_TARGET := $(TARGET_NAME)_$(platform).velf EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf MACHDEP := -DVITA - PLATCFLAGS := -O3 -U__ARM_NEON__ + PLATCFLAGS := -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant -U__ARM_NEON__ LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub \ -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \ - -lScePower_stub -lSceRtc_stub -lz -lm -lc + -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lz -lm -lc PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_neon.o \ audio/drivers_resampler/cc_resampler_neon.o diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c index 153dceace4..fae9642cfd 100644 --- a/gfx/drivers/vita2d_gfx.c +++ b/gfx/drivers/vita2d_gfx.c @@ -142,7 +142,7 @@ static bool vita2d_gfx_frame(void *data, const void *frame, vita->width = width; vita->height = height; vita->texture = vita2d_create_empty_texture_format(width, height, vita->format); - vita2d_texture_set_texture_filter(vita->texture,vita->tex_filter); + vita2d_texture_set_filters(vita->texture,vita->tex_filter,vita->tex_filter); } tex_p = vita2d_texture_get_datap(vita->texture); stride = vita2d_texture_get_stride(vita->texture); @@ -424,7 +424,7 @@ static void vita_set_filtering(void *data, unsigned index, bool smooth) if (vita) { vita->tex_filter = smooth? SCE_GXM_TEXTURE_FILTER_LINEAR : SCE_GXM_TEXTURE_FILTER_POINT; - vita2d_texture_set_texture_filter(vita->texture,vita->tex_filter); + vita2d_texture_set_filters(vita->texture,vita->tex_filter,vita->tex_filter); } } @@ -499,7 +499,7 @@ static void vita_set_texture_frame(void *data, const void *frame, bool rgb32, vita->menu.width = width; vita->menu.height = height; } - vita2d_texture_set_texture_filter(vita->menu.texture,SCE_GXM_TEXTURE_FILTER_LINEAR); + vita2d_texture_set_filters(vita->menu.texture,SCE_GXM_TEXTURE_FILTER_LINEAR,SCE_GXM_TEXTURE_FILTER_LINEAR); tex_p = vita2d_texture_get_datap(vita->menu.texture); stride = vita2d_texture_get_stride(vita->menu.texture); From da907ab54f1e9f7ab7cb2ac9d8934717af013734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s?= Date: Mon, 14 Sep 2015 18:32:12 -0500 Subject: [PATCH 004/311] add extra.json --- Makefile.griffin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.griffin b/Makefile.griffin index c462d9b07d..6807fcc230 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -359,7 +359,7 @@ all: $(EXT_TARGET) %.velf: %.elf arm-vita-eabi-strip -g $< - vita-elf-create $< $@ $(VITASDK)/bin/db.json + vita-elf-create $< $@ $(VITASDK)/bin/db.json $(VITASDK)/bin/extra.json %.elf32: %.elf ifeq ($(platform), xenon360) From fc64f6d82a26d3e861859744722b851dd23820c4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 14 Sep 2015 21:47:41 -0400 Subject: [PATCH 005/311] msvc: Conditionally enable the snprintf macro VS2015 implements the normal form of snprintf, so the define will cause compile errors. --- libretro-common/include/compat/msvc.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libretro-common/include/compat/msvc.h b/libretro-common/include/compat/msvc.h index 6a76876662..c0c2364aa1 100644 --- a/libretro-common/include/compat/msvc.h +++ b/libretro-common/include/compat/msvc.h @@ -23,14 +23,15 @@ #ifndef __LIBRETRO_SDK_COMPAT_MSVC_H #define __LIBRETRO_SDK_COMPAT_MSVC_H -#ifdef _WIN32 +#ifdef _MSC_VER + +// Pre-MSVC 2015 compilers don't implement snprintf in a cross-platform manner. +#if _MSC_VER < 1900 #ifndef snprintf #define snprintf _snprintf #endif #endif -#ifdef _MSC_VER - #undef UNICODE /* Do not bother with UNICODE at this time. */ #include #include From 3c0a5e09bd24abf7a2556c7501f925b5802b49ef Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 15 Sep 2015 04:37:28 +0200 Subject: [PATCH 006/311] (intl/spanish.h) Change header guard --- intl/spanish.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intl/spanish.h b/intl/spanish.h index a8111c5811..6824cf1c43 100644 --- a/intl/spanish.h +++ b/intl/spanish.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef __INTL_ENGLISH_H -#define __INTL_ENGLISH_H +#ifndef __INTL_SPANISH_H +#define __INTL_SPANISH_H #define RETRO_LBL_JOYPAD_B "Botón B RetroPad" #define RETRO_LBL_JOYPAD_Y "Botón Y RetroPad" From e0c7d0905d276581b358260a534c587302058e97 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 15 Sep 2015 04:49:10 +0200 Subject: [PATCH 007/311] Header cleanups --- frontend/drivers/platform_ctr.c | 7 ++++--- frontend/drivers/platform_emscripten.c | 4 +++- frontend/drivers/platform_linux.c | 4 ++-- frontend/drivers/platform_psp.c | 2 +- frontend/drivers/platform_qnx.c | 8 +++++--- frontend/drivers/platform_wii.c | 4 +++- frontend/drivers/platform_win32.c | 2 +- frontend/drivers/platform_xenon.c | 6 ++++-- 8 files changed, 23 insertions(+), 14 deletions(-) diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index dc415f52bc..1c17649d34 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -13,13 +13,14 @@ * If not, see . */ -#include <3ds.h> - #include -#include #include #include +#include + +#include <3ds.h> + #include #ifndef IS_SALAMANDER #include diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c index 764f2ba715..8c4b1f7860 100644 --- a/frontend/drivers/platform_emscripten.c +++ b/frontend/drivers/platform_emscripten.c @@ -16,8 +16,10 @@ */ #include -#include "../../general.h" + #include + +#include "../../general.h" #include "../../content.h" #include "../frontend.h" #include "../../retroarch.h" diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 6f8188c332..3b76acfc8d 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -16,16 +16,16 @@ #include #include -#include #include #include #include -#include #include #include #include +#include +#include #include #include diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index 45eb218cb9..ee0ccb8dc8 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -15,7 +15,6 @@ */ #include -#include #include #include @@ -32,6 +31,7 @@ int scePowerSetArmClockFrequency(int freq); #include #endif +#include #include #include #ifndef IS_SALAMANDER diff --git a/frontend/drivers/platform_qnx.c b/frontend/drivers/platform_qnx.c index fe48376906..b0ce0e00f7 100644 --- a/frontend/drivers/platform_qnx.c +++ b/frontend/drivers/platform_qnx.c @@ -14,12 +14,14 @@ * If not, see . */ -#include - #include -#include #include #include + +#include + +#include + #include "../../dynamic.h" #include "../../libretro_private.h" diff --git a/frontend/drivers/platform_wii.c b/frontend/drivers/platform_wii.c index 609b6279ad..9c3ce4bc3f 100644 --- a/frontend/drivers/platform_wii.c +++ b/frontend/drivers/platform_wii.c @@ -18,10 +18,10 @@ #include #include #include + #include #include #include -#include "../../gfx/drivers/ppc_asm.h" #include #include #include @@ -30,6 +30,8 @@ #include #include +#include "../../gfx/drivers/ppc_asm.h" + #define EXECUTE_ADDR ((uint8_t *) 0x91800000) #define BOOTER_ADDR ((uint8_t *) 0x93000000) #define ARGS_ADDR ((uint8_t *) 0x93200000) diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c index c25459ae08..0d05c3aa4a 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c @@ -13,12 +13,12 @@ */ #include -#include #include #include #include +#include #include #include #include diff --git a/frontend/drivers/platform_xenon.c b/frontend/drivers/platform_xenon.c index 21337841b6..678116d522 100644 --- a/frontend/drivers/platform_xenon.c +++ b/frontend/drivers/platform_xenon.c @@ -15,21 +15,23 @@ */ #include -#include #include #include +#include