godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcpak: Fix Android ARMv7 build with NDK r23

Browse Source 
Fix merged upstream.
Fixes #62516.
This commit is contained in:
Rémi Verschelde 2022-06-29 14:22:56 +02:00
parent 26dd4746a1
commit de75085c7f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@ -118,7 +118,7 @@ will limit its functionality to IPv4 only.
## etcpak ## etcpak
- Upstream: https://github.com/wolfpld/etcpak - Upstream: https://github.com/wolfpld/etcpak
- Version: 1.0 (a77d5a37ddf48034cee8aeb9e8792a623c265b4c, 2022) - Version: 1.0 (153f0e04a18b93c277684b577365210adcf8e11c, 2022)
- License: BSD-3-Clause - License: BSD-3-Clause
Files extracted from upstream source: Files extracted from upstream source:

8
thirdparty/etcpak/ProcessRGB.cpp vendored
View File

@ -3216,9 +3216,9 @@ etcpak_force_inline static uint16x8_t ErrorProbe_EAC_NEON( uint8x8_t recVal, uin
uint8x8_t srcValWide; uint8x8_t srcValWide;
#ifndef __aarch64__ #ifndef __aarch64__
if( Index < 8 ) if( Index < 8 )
srcValWide = vdup_lane_u8( vget_low_u8( alphaBlock ), ClampConstant( Index, 0, 8 ) ); srcValWide = vdup_lane_u8( vget_low_u8( alphaBlock ), ClampConstant( Index, 0, 7 ) );
else else
srcValWide = vdup_lane_u8( vget_high_u8( alphaBlock ), ClampConstant( Index - 8, 0, 8 ) ); srcValWide = vdup_lane_u8( vget_high_u8( alphaBlock ), ClampConstant( Index - 8, 0, 7 ) );
#else #else
srcValWide = vdup_laneq_u8( alphaBlock, Index ); srcValWide = vdup_laneq_u8( alphaBlock, Index );
#endif #endif
@ -3256,9 +3256,9 @@ etcpak_force_inline static int16x8_t WidenMultiplier_EAC_NEON( int16x8_t multipl
constexpr int Lane = GetMulSel( Index ); constexpr int Lane = GetMulSel( Index );
#ifndef __aarch64__ #ifndef __aarch64__
if( Lane < 4 ) if( Lane < 4 )
return vdupq_lane_s16( vget_low_s16( multipliers ), ClampConstant( Lane, 0, 4 ) ); return vdupq_lane_s16( vget_low_s16( multipliers ), ClampConstant( Lane, 0, 3 ) );
else else
return vdupq_lane_s16( vget_high_s16( multipliers ), ClampConstant( Lane - 4, 0, 4 ) ); return vdupq_lane_s16( vget_high_s16( multipliers ), ClampConstant( Lane - 4, 0, 3 ) );
#else #else
return vdupq_laneq_s16( multipliers, Lane ); return vdupq_laneq_s16( multipliers, Lane );
#endif #endif