Merge pull request #60998 from bruvzg/etc_arm64

akien-mga · web-flow · commit 677b63d7656f · 2022-05-13T15:22:42.000+02:00
diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -115,7 +115,7 @@ will limit its functionality to IPv4 only.
 ## etcpak
 
 - Upstream: https://github.com/wolfpld/etcpak
-- Version: git (10fc4ce627f9a17ed49bf97fcc3796a712033ba1, 2022)
+- Version: git (f128369e64a5f4715de8125b325e4fe7debb5194, 2022)
 - License: BSD-3-Clause
 
 Files extracted from upstream source:
diff --git a/thirdparty/etcpak/ProcessRGB.cpp b/thirdparty/etcpak/ProcessRGB.cpp
@@ -3070,7 +3070,7 @@ static etcpak_force_inline uint64_t ProcessRGB_ETC2( const uint8_t* src, bool us
 #else
     if( useHeuristics )
     {
-#ifdef defined __ARM_NEON && defined __aarch64__
+#if defined __ARM_NEON && defined __aarch64__
         Channels ch = GetChannels( src );
         CalculateLuma( ch, luma );
 #else

Original file line number	Diff line number	Diff line change
`@@ -3070,7 +3070,7 @@ static etcpak_force_inline uint64_t ProcessRGB_ETC2( const uint8_t* src, bool us`
`3070`	`3070`	`#else`
`3071`	`3071`	`if( useHeuristics )`
`3072`	`3072`	`{`
`3073`		`-#ifdef defined __ARM_NEON && defined __aarch64__`
	`3073`	`+#if defined __ARM_NEON && defined __aarch64__`
`3074`	`3074`	`Channels ch = GetChannels( src );`
`3075`	`3075`	`CalculateLuma( ch, luma );`
`3076`	`3076`	`#else`