mirror of
https://github.com/libretro/neocd_libretro.git
synced 2024-11-27 02:20:38 +00:00
Update libretro-common
This commit is contained in:
parent
de42c4f280
commit
9c07f2c629
8
deps/libretro-common/compat/compat_getopt.c
vendored
8
deps/libretro-common/compat/compat_getopt.c
vendored
@ -35,8 +35,6 @@
|
||||
#include <compat/strcasestr.h>
|
||||
#include <compat/posix_string.h>
|
||||
|
||||
#include <retro_assert.h>
|
||||
|
||||
char *optarg;
|
||||
int optind, opterr, optopt;
|
||||
|
||||
@ -184,8 +182,6 @@ static void shuffle_block(char **begin, char **last, char **end)
|
||||
ptrdiff_t len = last - begin;
|
||||
const char **tmp = (const char**)calloc(len, sizeof(const char*));
|
||||
|
||||
retro_assert(tmp);
|
||||
|
||||
memcpy((void*)tmp, begin, len * sizeof(const char*));
|
||||
memmove(begin, last, (end - last) * sizeof(const char*));
|
||||
memcpy(end - len, tmp, len * sizeof(const char*));
|
||||
@ -198,8 +194,6 @@ int getopt_long(int argc, char *argv[],
|
||||
{
|
||||
int short_index, long_index;
|
||||
|
||||
(void)longindex;
|
||||
|
||||
if (optind == 0)
|
||||
optind = 1;
|
||||
|
||||
@ -227,8 +221,6 @@ int getopt_long(int argc, char *argv[],
|
||||
long_index = 0;
|
||||
}
|
||||
|
||||
retro_assert(short_index == 0 || long_index == 0);
|
||||
|
||||
if (short_index == 0)
|
||||
return parse_short(optstring, &argv[optind]);
|
||||
if (long_index == 0)
|
||||
|
1
deps/libretro-common/file/file_path_io.c
vendored
1
deps/libretro-common/file/file_path_io.c
vendored
@ -29,7 +29,6 @@
|
||||
|
||||
#include <boolean.h>
|
||||
#include <file/file_path.h>
|
||||
#include <retro_assert.h>
|
||||
#include <compat/strl.h>
|
||||
#include <compat/posix_string.h>
|
||||
#include <retro_miscellaneous.h>
|
||||
|
29
deps/libretro-common/include/libretro.h
vendored
29
deps/libretro-common/include/libretro.h
vendored
@ -289,6 +289,8 @@ enum retro_language
|
||||
RETRO_LANGUAGE_CZECH = 27,
|
||||
RETRO_LANGUAGE_CATALAN_VALENCIA = 28,
|
||||
RETRO_LANGUAGE_CATALAN = 29,
|
||||
RETRO_LANGUAGE_BRITISH_ENGLISH = 30,
|
||||
RETRO_LANGUAGE_HUNGARIAN = 31,
|
||||
RETRO_LANGUAGE_LAST,
|
||||
|
||||
/* Ensure sizeof(enum) == sizeof(int) */
|
||||
@ -1765,6 +1767,33 @@ enum retro_mod
|
||||
* (see enum retro_savestate_context)
|
||||
*/
|
||||
|
||||
#define RETRO_ENVIRONMENT_GET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_SUPPORT (73 | RETRO_ENVIRONMENT_EXPERIMENTAL)
|
||||
/* struct retro_hw_render_context_negotiation_interface * --
|
||||
* Before calling SET_HW_RNEDER_CONTEXT_NEGOTIATION_INTERFACE, a core can query
|
||||
* which version of the interface is supported.
|
||||
*
|
||||
* Frontend looks at interface_type and returns the maximum supported
|
||||
* context negotiation interface version.
|
||||
* If the interface_type is not supported or recognized by the frontend, a version of 0
|
||||
* must be returned in interface_version and true is returned by frontend.
|
||||
*
|
||||
* If this environment call returns true with interface_version greater than 0,
|
||||
* a core can always use a negotiation interface version larger than what the frontend returns, but only
|
||||
* earlier versions of the interface will be used by the frontend.
|
||||
* A frontend must not reject a negotiation interface version that is larger than
|
||||
* what the frontend supports. Instead, the frontend will use the older entry points that it recognizes.
|
||||
* If this is incompatible with a particular core's requirements, it can error out early.
|
||||
*
|
||||
* Backwards compatibility note:
|
||||
* This environment call was introduced after Vulkan v1 context negotiation.
|
||||
* If this environment call is not supported by frontend - i.e. the environment call returns false -
|
||||
* only Vulkan v1 context negotiation is supported (if Vulkan HW rendering is supported at all).
|
||||
* If a core uses Vulkan negotiation interface with version > 1, negotiation may fail unexpectedly.
|
||||
* All future updates to the context negotiation interface implies that frontend must support
|
||||
* this environment call to query support.
|
||||
*/
|
||||
|
||||
|
||||
/* VFS functionality */
|
||||
|
||||
/* File paths:
|
||||
|
15
deps/libretro-common/include/retro_endianness.h
vendored
15
deps/libretro-common/include/retro_endianness.h
vendored
@ -74,28 +74,29 @@ static INLINE uint64_t SWAP64(uint64_t val)
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#if defined (LSB_FIRST) || defined (MSB_FIRST)
|
||||
# warning Defining MSB_FIRST and LSB_FIRST in compile options is deprecated
|
||||
# undef LSB_FIRST
|
||||
# undef MSB_FIRST
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
/* MSVC pre-defines macros depending on target arch */
|
||||
#if defined (_M_IX86) || defined (_M_AMD64) || defined (_M_ARM) || defined (_M_ARM64)
|
||||
#ifndef LSB_FIRST
|
||||
#define LSB_FIRST 1
|
||||
#endif
|
||||
#elif _M_PPC
|
||||
#ifndef MSB_FIRST
|
||||
#define MSB_FIRST 1
|
||||
#endif
|
||||
#else
|
||||
/* MSVC can run on _M_ALPHA and _M_IA64 too, but they're both bi-endian; need to find what mode MSVC runs them at */
|
||||
#error "unknown platform, can't determine endianness"
|
||||
#endif
|
||||
#else
|
||||
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||
#ifndef MSB_FIRST
|
||||
#define MSB_FIRST 1
|
||||
#endif
|
||||
#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
#ifndef LSB_FIRST
|
||||
#define LSB_FIRST 1
|
||||
#endif
|
||||
#else
|
||||
#error "Invalid endianness macros"
|
||||
#endif
|
||||
|
@ -74,6 +74,17 @@ static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
|
||||
return false;
|
||||
}
|
||||
|
||||
static INLINE bool bits_any_different(uint32_t *a, uint32_t *b, uint32_t count)
|
||||
{
|
||||
uint32_t i;
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
if (a[i] != b[i])
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifndef PATH_MAX_LENGTH
|
||||
#if defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(__PSL1GHT__) || defined(__PS3__)
|
||||
#define PATH_MAX_LENGTH 512
|
||||
|
4
deps/libretro-common/lists/string_list.c
vendored
4
deps/libretro-common/lists/string_list.c
vendored
@ -448,11 +448,11 @@ int string_list_find_elem(const struct string_list *list, const char *elem)
|
||||
{
|
||||
if (list)
|
||||
{
|
||||
int i;
|
||||
size_t i;
|
||||
for (i = 0; i < list->size; i++)
|
||||
{
|
||||
if (string_is_equal_noncase(list->elems[i].data, elem))
|
||||
return (i + 1);
|
||||
return (int)(i + 1);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
2
deps/libretro-common/string/stdstring.c
vendored
2
deps/libretro-common/string/stdstring.c
vendored
@ -233,7 +233,7 @@ void word_wrap(
|
||||
|
||||
/* Early return if src string length is less
|
||||
* than line width */
|
||||
if (src_len < line_width)
|
||||
if (src_len < (size_t)line_width)
|
||||
{
|
||||
strlcpy(dst, src, dst_size);
|
||||
return;
|
||||
|
3
deps/libretro-common/time/rtime.c
vendored
3
deps/libretro-common/time/rtime.c
vendored
@ -22,7 +22,6 @@
|
||||
|
||||
#ifdef HAVE_THREADS
|
||||
#include <rthreads/rthreads.h>
|
||||
#include <retro_assert.h>
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
@ -41,8 +40,6 @@ void rtime_init(void)
|
||||
#ifdef HAVE_THREADS
|
||||
if (!rtime_localtime_lock)
|
||||
rtime_localtime_lock = slock_new();
|
||||
|
||||
retro_assert(rtime_localtime_lock);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
61
deps/libretro-common/vfs/vfs_implementation.c
vendored
61
deps/libretro-common/vfs/vfs_implementation.c
vendored
@ -120,9 +120,60 @@
|
||||
#endif
|
||||
|
||||
#if defined(__PS3__) || defined(__PSL1GHT__)
|
||||
#include <defines/ps3_defines.h>
|
||||
#if defined(__PSL1GHT__)
|
||||
#define FS_SUCCEEDED 0
|
||||
#define FS_TYPE_DIR 1
|
||||
#ifdef __PSL1GHT__
|
||||
#include <lv2/sysfs.h>
|
||||
#ifndef O_RDONLY
|
||||
#define O_RDONLY SYS_O_RDONLY
|
||||
#endif
|
||||
#ifndef O_WRONLY
|
||||
#define O_WRONLY SYS_O_WRONLY
|
||||
#endif
|
||||
#ifndef O_CREAT
|
||||
#define O_CREAT SYS_O_CREAT
|
||||
#endif
|
||||
#ifndef O_TRUNC
|
||||
#define O_TRUNC SYS_O_TRUNC
|
||||
#endif
|
||||
#ifndef O_RDWR
|
||||
#define O_RDWR SYS_O_RDWR
|
||||
#endif
|
||||
#else
|
||||
#include <cell/cell_fs.h>
|
||||
#ifndef O_RDONLY
|
||||
#define O_RDONLY CELL_FS_O_RDONLY
|
||||
#endif
|
||||
#ifndef O_WRONLY
|
||||
#define O_WRONLY CELL_FS_O_WRONLY
|
||||
#endif
|
||||
#ifndef O_CREAT
|
||||
#define O_CREAT CELL_FS_O_CREAT
|
||||
#endif
|
||||
#ifndef O_TRUNC
|
||||
#define O_TRUNC CELL_FS_O_TRUNC
|
||||
#endif
|
||||
#ifndef O_RDWR
|
||||
#define O_RDWR CELL_FS_O_RDWR
|
||||
#endif
|
||||
#ifndef sysFsStat
|
||||
#define sysFsStat cellFsStat
|
||||
#endif
|
||||
#ifndef sysFSDirent
|
||||
#define sysFSDirent CellFsDirent
|
||||
#endif
|
||||
#ifndef sysFsOpendir
|
||||
#define sysFsOpendir cellFsOpendir
|
||||
#endif
|
||||
#ifndef sysFsReaddir
|
||||
#define sysFsReaddir cellFsReaddir
|
||||
#endif
|
||||
#ifndef sysFSDirent
|
||||
#define sysFSDirent CellFsDirent
|
||||
#endif
|
||||
#ifndef sysFsClosedir
|
||||
#define sysFsClosedir cellFsClosedir
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -648,7 +699,7 @@ int64_t retro_vfs_file_read_impl(libretro_vfs_implementation_file *stream,
|
||||
|
||||
int64_t retro_vfs_file_write_impl(libretro_vfs_implementation_file *stream, const void *s, uint64_t len)
|
||||
{
|
||||
int64_t pos = 0;
|
||||
int64_t pos = 0;
|
||||
size_t result = -1;
|
||||
|
||||
if (!stream)
|
||||
@ -656,7 +707,7 @@ int64_t retro_vfs_file_write_impl(libretro_vfs_implementation_file *stream, cons
|
||||
|
||||
if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
|
||||
{
|
||||
pos = retro_vfs_file_tell_impl(stream);
|
||||
pos = retro_vfs_file_tell_impl(stream);
|
||||
result = fwrite(s, 1, (size_t)len, stream->fp);
|
||||
|
||||
if (result != -1 && pos + result > stream->size)
|
||||
@ -669,7 +720,7 @@ int64_t retro_vfs_file_write_impl(libretro_vfs_implementation_file *stream, cons
|
||||
return -1;
|
||||
#endif
|
||||
|
||||
pos = retro_vfs_file_tell_impl(stream);
|
||||
pos = retro_vfs_file_tell_impl(stream);
|
||||
result = write(stream->fd, s, (size_t)len);
|
||||
|
||||
if (result != -1 && pos + result > stream->size)
|
||||
|
@ -48,7 +48,6 @@
|
||||
#include <encodings/utf.h>
|
||||
#include <retro_miscellaneous.h>
|
||||
#include <file/file_path.h>
|
||||
#include <retro_assert.h>
|
||||
#include <string/stdstring.h>
|
||||
#include <retro_environment.h>
|
||||
#include <uwp/uwp_async.h>
|
||||
|
Loading…
Reference in New Issue
Block a user