ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libpng: address a non-compliant define

This commit is contained in:
Ender's Games 2018-08-07 23:36:20 -04:00
parent 38edff3dae
commit f40826614a
3 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core.mk
View File

@ -111,7 +111,4 @@ ifdef HAS_SOFTREND
RZDCY_CFLAGS += -DTARGET_SOFTREND
endif
# png_init_filter_functions_neon
RZDCY_CFLAGS += -DPNG_ARM_NEON_OPT=0
RZDCY_CXXFLAGS := $(RZDCY_CFLAGS) -fno-exceptions -fno-rtti -std=gnu++11

3
core/deps/libpng/config.h
View File

@ -77,7 +77,8 @@
/* #undef PNG_ARM_NEON_CHECK_SUPPORTED */
/* Enable ARM Neon optimizations */
#define PNG_ARM_NEON_OPT 0
/* #define PNG_ARM_NEON_OPT 0 */
/* Forcefully removed for non-compliance */
/* Enable Intel SSE optimizations */
#define PNG_INTEL_SSE_OPT 0

96
core/deps/libpng/pngpriv.h
View File

@ -135,54 +135,54 @@
# endif
#endif
#if PNG_ARM_NEON_OPT > 0
/* NEON optimizations are to be at least considered by libpng, so enable the
* callbacks to do this.
*/
# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
/* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used
* if possible - if __ARM_NEON__ is set and the compiler version is not known
* to be broken. This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can
* be:
*
* 1 The intrinsics code (the default with __ARM_NEON__)
* 2 The hand coded assembler (the default without __ARM_NEON__)
*
* It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however
* this is *NOT* supported and may cease to work even after a minor revision
* to libpng. It *is* valid to do this for testing purposes, e.g. speed
* testing or a new compiler, but the results should be communicated to the
* libpng implementation list for incorporation in the next minor release.
*/
# ifndef PNG_ARM_NEON_IMPLEMENTATION
# if defined(__ARM_NEON__) || defined(__ARM_NEON)
# if defined(__clang__)
/* At present it is unknown by the libpng developers which versions
* of clang support the intrinsics, however some or perhaps all
* versions do not work with the assembler so this may be
* irrelevant, so just use the default (do nothing here.)
*/
# elif defined(__GNUC__)
/* GCC 4.5.4 NEON support is known to be broken. 4.6.3 is known to
* work, so if this *is* GCC, or G++, look for a version >4.5
*/
# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
# define PNG_ARM_NEON_IMPLEMENTATION 2
# endif /* no GNUC support */
# endif /* __GNUC__ */
# else /* !defined __ARM_NEON__ */
/* The 'intrinsics' code simply won't compile without this -mfpu=neon:
*/
# define PNG_ARM_NEON_IMPLEMENTATION 2
# endif /* __ARM_NEON__ */
# endif /* !PNG_ARM_NEON_IMPLEMENTATION */
# ifndef PNG_ARM_NEON_IMPLEMENTATION
/* Use the intrinsics code by default. */
# define PNG_ARM_NEON_IMPLEMENTATION 1
# endif
#endif /* PNG_ARM_NEON_OPT > 0 */
//#if PNG_ARM_NEON_OPT > 0
// /* NEON optimizations are to be at least considered by libpng, so enable the
// * callbacks to do this.
// */
//# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
//
// /* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used
// * if possible - if __ARM_NEON__ is set and the compiler version is not known
// * to be broken. This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can
// * be:
// *
// * 1 The intrinsics code (the default with __ARM_NEON__)
// * 2 The hand coded assembler (the default without __ARM_NEON__)
// *
// * It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however
// * this is *NOT* supported and may cease to work even after a minor revision
// * to libpng. It *is* valid to do this for testing purposes, e.g. speed
// * testing or a new compiler, but the results should be communicated to the
// * libpng implementation list for incorporation in the next minor release.
// */
//# ifndef PNG_ARM_NEON_IMPLEMENTATION
//# if defined(__ARM_NEON__) || defined(__ARM_NEON)
//# if defined(__clang__)
// /* At present it is unknown by the libpng developers which versions
// * of clang support the intrinsics, however some or perhaps all
// * versions do not work with the assembler so this may be
// * irrelevant, so just use the default (do nothing here.)
// */
//# elif defined(__GNUC__)
// /* GCC 4.5.4 NEON support is known to be broken. 4.6.3 is known to
// * work, so if this *is* GCC, or G++, look for a version >4.5
// */
//# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
//# define PNG_ARM_NEON_IMPLEMENTATION 2
//# endif /* no GNUC support */
//# endif /* __GNUC__ */
//# else /* !defined __ARM_NEON__ */
// /* The 'intrinsics' code simply won't compile without this -mfpu=neon:
// */
//# define PNG_ARM_NEON_IMPLEMENTATION 2
//# endif /* __ARM_NEON__ */
//# endif /* !PNG_ARM_NEON_IMPLEMENTATION */
//
//# ifndef PNG_ARM_NEON_IMPLEMENTATION
// /* Use the intrinsics code by default. */
//# define PNG_ARM_NEON_IMPLEMENTATION 1
//# endif
//#endif /* PNG_ARM_NEON_OPT > 0 */
#ifndef PNG_MIPS_MSA_OPT
# if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)