diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-13 15:22:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-13 15:22:42 +0200 |
| commit | 677b63d7656fd0f11e224e0858fcf9479486595d (patch) | |
| tree | 39d39ee6a9cc3e5cdb14abb84165e73b4cb84b58 /thirdparty | |
| parent | 349aa9c88417557630bf7216b579b9ad753ab053 (diff) | |
| parent | 71cc26f55e013d9958444e0964a1493b23321257 (diff) | |
Merge pull request #60998 from bruvzg/etc_arm64
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/etcpak/ProcessRGB.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index d32db920ad..bb30105c56 100644 --- 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 index f488f3b282..fdb0967ce7 100644 --- 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 |