From 3025bcd012cd3e461b11bfb2b23d2884580c538a Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 18 Jul 2022 14:10:16 +0800 Subject: [PATCH] [v3.6.0] Optimize se::Object::getPrivateData, math::IsEqualF, Vec3::transformMat4 (#12039) --- .../workflows/native-compile-platforms.yml | 2 +- native/cocos/bindings/jswrapper/v8/Object.cpp | 3 + native/cocos/bindings/jswrapper/v8/Object.h | 3 +- native/cocos/core/assets/Font.cpp | 4 +- native/cocos/math/Mat4.h | 2 +- native/cocos/math/Math.cpp | 165 +++--------------- native/cocos/math/Math.h | 33 ++-- native/cocos/math/MathUtil.cpp | 7 - native/cocos/math/Quaternion.cpp | 6 +- native/cocos/math/Vec3.cpp | 77 +++++++- native/cocos/math/Vec3.h | 4 + .../canvas/CanvasRenderingContext2D.cpp | 4 +- .../renderer/gfx-gles2/GLES2CommandBuffer.cpp | 24 +-- .../cocos/renderer/gfx-gles2/GLES2Texture.cpp | 2 +- .../renderer/gfx-gles3/GLES3CommandBuffer.cpp | 24 +-- .../cocos/renderer/gfx-gles3/GLES3Texture.cpp | 2 +- .../gfx-metal/MTLRenderCommandEncoder.h | 6 +- native/cocos/renderer/gfx-metal/MTLUtils.mm | 4 +- .../DescriptorSetLayoutValidator.cpp | 2 +- .../gfx-validator/DeviceValidator.cpp | 8 +- .../renderer/gfx-vulkan/VKCommandBuffer.cpp | 20 +-- .../renderer/pipeline/ClusterLightCulling.h | 2 +- native/cocos/renderer/pipeline/Define.h | 14 +- native/tests/unit-test/src/utils.h | 2 +- .../generate_compile_commands_android.sh | 2 + templates/cmake/android.cmake | 6 + 26 files changed, 188 insertions(+), 240 deletions(-) mode change 100755 => 100644 native/cocos/math/Math.cpp diff --git a/.github/workflows/native-compile-platforms.yml b/.github/workflows/native-compile-platforms.yml index 5d0d36e63c..08c38cc3ed 100644 --- a/.github/workflows/native-compile-platforms.yml +++ b/.github/workflows/native-compile-platforms.yml @@ -127,7 +127,7 @@ jobs: # To speedup CI, compile arm64-v8a only # sed -i "s@^PROP_APP_ABI.*@PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86@g" gradle.properties - sed -i "s@^PROP_APP_ABI.*@PROP_APP_ABI=arm64-v8a@g" gradle.properties + sed -i "s@^PROP_APP_ABI.*@PROP_APP_ABI=armeabi-v7a:arm64-v8a@g" gradle.properties echo "Compile Android - cmake ..." echo "ANDORID_NDK ${ANDROID_NDK} or ${ANDROID_NDK_HOME}" diff --git a/native/cocos/bindings/jswrapper/v8/Object.cpp b/native/cocos/bindings/jswrapper/v8/Object.cpp index 30f9910c48..7c89467805 100644 --- a/native/cocos/bindings/jswrapper/v8/Object.cpp +++ b/native/cocos/bindings/jswrapper/v8/Object.cpp @@ -577,7 +577,10 @@ void Object::setPrivateObject(PrivateObjectBase *data) { _privateObject = data; if (data != nullptr) { + _privateData = data->getRaw(); NativePtrToObjectMap::emplace(data->getRaw(), this); + } else { + _privateData = nullptr; } } diff --git a/native/cocos/bindings/jswrapper/v8/Object.h b/native/cocos/bindings/jswrapper/v8/Object.h index 99abec92bf..defeb47d90 100644 --- a/native/cocos/bindings/jswrapper/v8/Object.h +++ b/native/cocos/bindings/jswrapper/v8/Object.h @@ -300,7 +300,7 @@ public: * @return A void* that is the object's private data, if the object has private data, otherwise nullptr. */ inline void *getPrivateData() const { - return _privateObject ? _privateObject->getRaw() : nullptr; + return _privateData; } /** @@ -455,6 +455,7 @@ private: uint32_t _rootCount{0}; PrivateObjectBase *_privateObject{nullptr}; + void *_privateData{nullptr}; V8FinalizeFunc _finalizeCb{nullptr}; bool _clearMappingInFinalizer{true}; diff --git a/native/cocos/core/assets/Font.cpp b/native/cocos/core/assets/Font.cpp index 57977e9476..9873c2d261 100644 --- a/native/cocos/core/assets/Font.cpp +++ b/native/cocos/core/assets/Font.cpp @@ -53,7 +53,7 @@ FontFaceInfo::FontFaceInfo(uint32_t size) FontFaceInfo::FontFaceInfo(uint32_t size, uint32_t width, uint32_t height) : fontSize(size), textureWidth(width), textureHeight(height) { - CC_ASSERT(math::IsPowerOfTwo(width) && math::IsPowerOfTwo(height)); // Font texture size must be power of 2. + CC_ASSERT(math::isPowerOfTwo(width) && math::isPowerOfTwo(height)); // Font texture size must be power of 2. // preload digit & alphabet characters by default for (auto i = 0U; i < 128; i++) { @@ -65,7 +65,7 @@ FontFaceInfo::FontFaceInfo(uint32_t size, uint32_t width, uint32_t height) FontFaceInfo::FontFaceInfo(uint32_t size, uint32_t width, uint32_t height, ccstd::vector chars) : fontSize(size), textureWidth(width), textureHeight(height), preLoadedCharacters(std::move(chars)) { - CC_ASSERT(math::IsPowerOfTwo(width) && math::IsPowerOfTwo(height)); // Font texture size must be power of 2. + CC_ASSERT(math::isPowerOfTwo(width) && math::isPowerOfTwo(height)); // Font texture size must be power of 2. } /** diff --git a/native/cocos/math/Mat4.h b/native/cocos/math/Mat4.h index d42daa0334..aa4d25b322 100644 --- a/native/cocos/math/Mat4.h +++ b/native/cocos/math/Mat4.h @@ -73,7 +73,7 @@ NS_CC_MATH_BEGIN * * @see Transform */ -class CC_DLL Mat4 { +class CC_DLL alignas(16) Mat4 { public: // //temp add conversion // operator kmMat4() const diff --git a/native/cocos/math/Math.cpp b/native/cocos/math/Math.cpp old mode 100755 new mode 100644 index fd8721ddcb..71fdc386bd --- a/native/cocos/math/Math.cpp +++ b/native/cocos/math/Math.cpp @@ -1,161 +1,36 @@ #include "math/Math.h" #include +#include #include #include -#include namespace cc { namespace math { -const float PI = (float)(3.14159265358979323846264338327950288419716939937511); -; -const float PI_2 = math::PI * 2.0f; -const float PI_DIV2 = math::PI * 0.5f; -const float PI_DIV3 = math::PI / 3.0f; -const float PI_DIV4 = math::PI / 4.0f; -const float PI_DIV5 = math::PI / 5.0f; -const float PI_DIV6 = math::PI / 6.0f; -const float PI_DIV8 = math::PI / 8.0f; -const float PI_SQR = (float)(9.86960440108935861883449099987615113531369940724079); -const float PI_INV = (float)(0.31830988618379067153776752674502872406891929148091); +const float PI = static_cast(3.14159265358979323846264338327950288419716939937511); + +const float PI_2 = math::PI * 2.0F; +const float PI_DIV2 = math::PI * 0.5F; +const float PI_DIV3 = math::PI / 3.0F; +const float PI_DIV4 = math::PI / 4.0F; +const float PI_DIV5 = math::PI / 5.0F; +const float PI_DIV6 = math::PI / 6.0F; +const float PI_DIV8 = math::PI / 8.0F; +const float PI_SQR = static_cast(9.86960440108935861883449099987615113531369940724079); +const float PI_INV = static_cast(0.31830988618379067153776752674502872406891929148091); const float EPSILON = std::numeric_limits::epsilon(); -const float LOW_EPSILON = (float)(1e-04); +const float LOW_EPSILON = static_cast(1e-04); const float POS_INFINITY = std::numeric_limits::infinity(); const float NEG_INFINITY = -std::numeric_limits::infinity(); -; -const float LN2 = std::log(2.0f); -const float LN10 = std::log(10.0f); -const float LN2_INV = 1.0f / LN2; -const float LN10_INV = 1.0f / LN10; -const float DEG_TO_RAD = (float)0.01745329; -const float RAD_TO_DEG = (float)57.29577; + +const float LN2 = std::log(2.0F); +const float LN10 = std::log(10.0F); +const float LN2_INV = 1.0F / LN2; +const float LN10_INV = 1.0F / LN10; +const float DEG_TO_RAD = static_cast(0.01745329); +const float RAD_TO_DEG = static_cast(57.29577); const float MIN_FLOAT = 1.175494351e-38F; const float MAX_FLOAT = 3.402823466e+38F; -const uint16_t CRC16_TABLE[256] = { - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, - 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, - 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, - 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, - 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, - 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, - 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, - 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, - 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, - 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, - 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, - 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, - 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, - 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, - 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, - 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, - 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, - 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, - 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, - 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, - 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, - 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, - 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, - 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, - 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, - 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, - 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, - 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, - 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, - 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, - 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0}; - -const uint32_t CRC32_TABLE[] = { - 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, - 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, - 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, - 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, - 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, - 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, - 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, - 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, - 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, - 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, - 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, - 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, - 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, - 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, - 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, - 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, - 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, - 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, - 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, - 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, - 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, - 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, - 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, - 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, - 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, - 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, - 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, - 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, - 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, - 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, - 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, - 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, - 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, - 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, - 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, - 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, - 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, - 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, - 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, - 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, - 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, - 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, - 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, - 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, - 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, - 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, - 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, - 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, - 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, - 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, - 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, - 0x2D02EF8D}; - -inline void CRCUpdateB(uint32_t &crc, uint8_t b) { - crc = CRC32_TABLE[(crc ^ b) & 0xFF] ^ (crc >> 8); -} - -uint32_t CRC32(const char *str) { - uint32_t crc = 0xFFFFFFFF; - size_t length = strlen(str); - - for (size_t i = 0; i < length; ++i) { - CRCUpdateB(crc, (uint8_t)str[i]); - } - - CRCUpdateB(crc, (uint8_t)length); - return crc; -} - -uint32_t CRC32NoCase(const char *str) { - uint32_t crc = 0xFFFFFFFF; - size_t length = strlen(str); - - for (size_t i = 0; i < length; ++i) { - CRCUpdateB(crc, (uint8_t)tolower((char)str[i])); - } - - CRCUpdateB(crc, (uint8_t)length); - return crc; -} - -uint16_t CRC16(const char *str) { - size_t length = strlen(str); - uint16_t crc = 0; - for (size_t i = 0; i < length; ++i) { - crc = (crc << 8) ^ CRC16_TABLE[((crc >> 8) ^ *str++) & 0x00FF]; - } - return crc; -} - } // namespace math } // namespace cc diff --git a/native/cocos/math/Math.h b/native/cocos/math/Math.h index 3377c34d4a..0e2c78848c 100644 --- a/native/cocos/math/Math.h +++ b/native/cocos/math/Math.h @@ -24,8 +24,9 @@ ****************************************************************************/ #pragma once -#include "base/Macros.h" #include +#include +#include "base/Macros.h" namespace cc { namespace math { @@ -53,36 +54,26 @@ extern CC_DLL const float RAD_TO_DEG; extern CC_DLL const float MIN_FLOAT; extern CC_DLL const float MAX_FLOAT; -uint16_t CRC16(const char *str); -uint32_t CRC32(const char *str); -uint32_t CRC32NoCase(const char *str); - template -inline T Abs(T x) { - return x > 0 ? x : -x; -} - -template -inline T Sgn(T x) { +inline T sgn(T x) { return (x < T(0) ? T(-1) : (x > T(0) ? T(1) : T(0))); } template -inline T Sqr(T x) { - return x * x; -} - -template -inline bool IsPowerOfTwo(T n) { +inline bool isPowerOfTwo(T n) { return (n & (n - 1)) == 0; } -inline bool IsEqualF(float lhs, float rhs, float precision = 0.000001f) { - return (Abs(lhs - rhs) < precision); +inline bool isEqualF(float lhs, float rhs, float precision = 0.000001F) { + return (std::abs(lhs - rhs) < precision); } -inline bool IsNotEqualF(float lhs, float rhs, float precision = 0.000001f) { - return (Abs(lhs - rhs) > precision); +inline bool isNotEqualF(float lhs, float rhs, float precision = 0.000001F) { + return (std::abs(lhs - rhs) > precision); +} + +inline bool isNotZeroF(float v, float precision = 0.000001F) { + return (std::abs(v) > precision); } } // namespace math diff --git a/native/cocos/math/MathUtil.cpp b/native/cocos/math/MathUtil.cpp index dc1f4a992b..110d5618c8 100644 --- a/native/cocos/math/MathUtil.cpp +++ b/native/cocos/math/MathUtil.cpp @@ -38,10 +38,6 @@ This file was modified to fit the cocos2d-x project #if defined(__arm64__) #define USE_NEON64 #define INCLUDE_NEON64 - #elif defined(__ARM_NEON__) - #define USE_NEON32 - #define INCLUDE_NEON32 - #else #endif #elif (CC_PLATFORM == CC_PLATFORM_ANDROID) #if defined(__arm64__) || defined(__aarch64__) @@ -49,10 +45,7 @@ This file was modified to fit the cocos2d-x project #define INCLUDE_NEON64 #elif defined(__ARM_NEON__) #define INCLUDE_NEON32 - #else #endif -#else - #endif #if defined(__SSE__) diff --git a/native/cocos/math/Quaternion.cpp b/native/cocos/math/Quaternion.cpp index 229fe95375..9662c4e8f8 100644 --- a/native/cocos/math/Quaternion.cpp +++ b/native/cocos/math/Quaternion.cpp @@ -331,9 +331,9 @@ void Quaternion::toEuler(const Quaternion &q, bool outerZ, Vec3 *out) { heading = atan2(2 * y * w - 2 * x * z, 1 - 2 * sqy - 2 * sqz) * r2d; attitude = asin(2 * test) * r2d; if (outerZ) { - bank = static_cast(-180.F * math::Sgn(bank + 1e-6) + bank); - heading = static_cast(-180.F * math::Sgn(heading + 1e-6) + heading); - attitude = static_cast(180.F * math::Sgn(attitude + 1e-6) - attitude); + bank = static_cast(-180.F * math::sgn(bank + 1e-6) + bank); + heading = static_cast(-180.F * math::sgn(heading + 1e-6) + heading); + attitude = static_cast(180.F * math::sgn(attitude + 1e-6) - attitude); } } out->x = bank; diff --git a/native/cocos/math/Vec3.cpp b/native/cocos/math/Vec3.cpp index cfe4f881bb..ac55924209 100644 --- a/native/cocos/math/Vec3.cpp +++ b/native/cocos/math/Vec3.cpp @@ -27,6 +27,32 @@ #include "math/MathUtil.h" #include "math/Quaternion.h" +#if (CC_PLATFORM == CC_PLATFORM_ANDROID) + #include +#endif + +#if (CC_PLATFORM == CC_PLATFORM_IOS) + #if defined(__arm64__) + #define USE_NEON64 + #define INCLUDE_NEON64 + #endif +#elif (CC_PLATFORM == CC_PLATFORM_ANDROID) + #if defined(__arm64__) || defined(__aarch64__) + #define USE_NEON64 + #define INCLUDE_NEON64 + #elif defined(__ARM_NEON__) + #define INCLUDE_NEON32 + #endif +#endif + +#if defined(USE_NEON64) || defined(USE_NEON32) || defined(INCLUDE_NEON32) + #include "enoki/array.h" + #ifndef ENOKI_ARM_NEON + #error "ENOKI_ARM_NEON isn't enabled!" + #endif +using SimdVec4 = enoki::Array; +#endif + NS_CC_MATH_BEGIN Vec3::Vec3(float xx, float yy, float zz) @@ -192,15 +218,62 @@ void Vec3::transformMat3(const Vec3 &v, const Mat3 &m) { z = ix * m.m[2] + iy * m.m[5] + iz * m.m[8]; } -void Vec3::transformMat4(const Vec3 &v, const Mat4 &m) { +void Vec3::transformMat4Neon(const Vec3 &v, const Mat4 &m) { +#if defined(USE_NEON64) || defined(USE_NEON32) || defined(INCLUDE_NEON32) + alignas(16) float tmpV0[4]; + + auto row0 = enoki::load(&m.m[0]); + auto row1 = enoki::load(&m.m[4]); + auto row2 = enoki::load(&m.m[8]); + auto row3 = enoki::load(&m.m[12]); + + row0 *= v.x; + row1 *= v.y; + row2 *= v.z; + + row0 = row0 + row1 + row2 + row3; + enoki::store(tmpV0, row0); + float rhw; + + if (CC_PREDICT_TRUE(math::isNotZeroF(tmpV0[3]))) { + rhw = 1.F / tmpV0[3]; + } else { + rhw = 1.F; + } + + SimdVec4 tmpV1{rhw}; + row0 *= tmpV1; + enoki::store(tmpV0, row0); + + x = tmpV0[0]; + y = tmpV0[1]; + z = tmpV0[2]; +#endif +} + +void Vec3::transformMat4C(const Vec3 &v, const Mat4 &m) { alignas(16) float tmp[4] = {v.x, v.y, v.z, 1.0F}; MathUtil::transformVec4(m.m, tmp, tmp); - float rhw = math::IsNotEqualF(tmp[3], 0.0F) ? 1 / tmp[3] : 1; + float rhw = math::isNotZeroF(tmp[3]) ? 1.F / tmp[3] : 1.F; x = tmp[0] * rhw; y = tmp[1] * rhw; z = tmp[2] * rhw; } +void Vec3::transformMat4(const Vec3 &v, const Mat4 &m) { +#if defined(USE_NEON64) + transformMat4Neon(v, m); +#elif defined(INCLUDE_NEON32) + if (CC_PREDICT_TRUE(MathUtil::isNeon32Enabled())) { + transformMat4Neon(v, m); + } else { + transformMat4C(v, m); + } +#else + transformMat4C(v, m); +#endif +} + void Vec3::transformMat4(const Vec3 &v, const Mat4 &m, Vec3 *dst) { dst->transformMat4(v, m); } diff --git a/native/cocos/math/Vec3.h b/native/cocos/math/Vec3.h index 246280776b..7d58f94a41 100644 --- a/native/cocos/math/Vec3.h +++ b/native/cocos/math/Vec3.h @@ -615,6 +615,10 @@ public: static const Vec3 UNIT_Z; /** equals to Vec3(0,0,-1) */ static const Vec3 FORWARD; + +private: + void transformMat4C(const Vec3 &v, const Mat4 &m); + void transformMat4Neon(const Vec3 &v, const Mat4 &m); }; /** diff --git a/native/cocos/platform/interfaces/modules/canvas/CanvasRenderingContext2D.cpp b/native/cocos/platform/interfaces/modules/canvas/CanvasRenderingContext2D.cpp index b3b3d66427..5f271d7611 100644 --- a/native/cocos/platform/interfaces/modules/canvas/CanvasRenderingContext2D.cpp +++ b/native/cocos/platform/interfaces/modules/canvas/CanvasRenderingContext2D.cpp @@ -161,14 +161,14 @@ void CanvasRenderingContext2D::fetchData() { void CanvasRenderingContext2D::setWidth(float width) { //SE_LOGD("CanvasRenderingContext2D::set__width: %f\n", width); - if (math::IsEqualF(width, _width)) return; + if (math::isEqualF(width, _width)) return; _width = width; _isBufferSizeDirty = true; } void CanvasRenderingContext2D::setHeight(float height) { //SE_LOGD("CanvasRenderingContext2D::set__height: %f\n", height); - if (math::IsEqualF(height, _height)) return; + if (math::isEqualF(height, _height)) return; _height = height; _isBufferSizeDirty = true; } diff --git a/native/cocos/renderer/gfx-gles2/GLES2CommandBuffer.cpp b/native/cocos/renderer/gfx-gles2/GLES2CommandBuffer.cpp index 025586f7a4..43c525fdff 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2CommandBuffer.cpp +++ b/native/cocos/renderer/gfx-gles2/GLES2CommandBuffer.cpp @@ -174,8 +174,8 @@ void GLES2CommandBuffer::setViewport(const Viewport &vp) { (_curDynamicStates.viewport.top != vp.top) || (_curDynamicStates.viewport.width != vp.width) || (_curDynamicStates.viewport.height != vp.height) || - math::IsNotEqualF(_curDynamicStates.viewport.minDepth, vp.minDepth) || - math::IsNotEqualF(_curDynamicStates.viewport.maxDepth, vp.maxDepth)) { + math::isNotEqualF(_curDynamicStates.viewport.minDepth, vp.minDepth) || + math::isNotEqualF(_curDynamicStates.viewport.maxDepth, vp.maxDepth)) { _curDynamicStates.viewport = vp; _isStateInvalid = true; } @@ -192,16 +192,16 @@ void GLES2CommandBuffer::setScissor(const Rect &rect) { } void GLES2CommandBuffer::setLineWidth(float width) { - if (math::IsNotEqualF(_curDynamicStates.lineWidth, width)) { + if (math::isNotEqualF(_curDynamicStates.lineWidth, width)) { _curDynamicStates.lineWidth = width; _isStateInvalid = true; } } void GLES2CommandBuffer::setDepthBias(float constant, float clamp, float slope) { - if (math::IsNotEqualF(_curDynamicStates.depthBiasConstant, constant) || - math::IsNotEqualF(_curDynamicStates.depthBiasClamp, clamp) || - math::IsNotEqualF(_curDynamicStates.depthBiasSlope, slope)) { + if (math::isNotEqualF(_curDynamicStates.depthBiasConstant, constant) || + math::isNotEqualF(_curDynamicStates.depthBiasClamp, clamp) || + math::isNotEqualF(_curDynamicStates.depthBiasSlope, slope)) { _curDynamicStates.depthBiasConstant = constant; _curDynamicStates.depthBiasClamp = clamp; _curDynamicStates.depthBiasSlope = slope; @@ -210,10 +210,10 @@ void GLES2CommandBuffer::setDepthBias(float constant, float clamp, float slope) } void GLES2CommandBuffer::setBlendConstants(const Color &constants) { - if (math::IsNotEqualF(_curDynamicStates.blendConstant.x, constants.x) || - math::IsNotEqualF(_curDynamicStates.blendConstant.y, constants.y) || - math::IsNotEqualF(_curDynamicStates.blendConstant.z, constants.z) || - math::IsNotEqualF(_curDynamicStates.blendConstant.w, constants.w)) { + if (math::isNotEqualF(_curDynamicStates.blendConstant.x, constants.x) || + math::isNotEqualF(_curDynamicStates.blendConstant.y, constants.y) || + math::isNotEqualF(_curDynamicStates.blendConstant.z, constants.z) || + math::isNotEqualF(_curDynamicStates.blendConstant.w, constants.w)) { _curDynamicStates.blendConstant.x = constants.x; _curDynamicStates.blendConstant.y = constants.y; _curDynamicStates.blendConstant.z = constants.z; @@ -223,8 +223,8 @@ void GLES2CommandBuffer::setBlendConstants(const Color &constants) { } void GLES2CommandBuffer::setDepthBound(float minBounds, float maxBounds) { - if (math::IsNotEqualF(_curDynamicStates.depthMinBounds, minBounds) || - math::IsNotEqualF(_curDynamicStates.depthMaxBounds, maxBounds)) { + if (math::isNotEqualF(_curDynamicStates.depthMinBounds, minBounds) || + math::isNotEqualF(_curDynamicStates.depthMaxBounds, maxBounds)) { _curDynamicStates.depthMinBounds = minBounds; _curDynamicStates.depthMaxBounds = maxBounds; _isStateInvalid = true; diff --git a/native/cocos/renderer/gfx-gles2/GLES2Texture.cpp b/native/cocos/renderer/gfx-gles2/GLES2Texture.cpp index 5cdc09da51..02ee59c222 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2Texture.cpp +++ b/native/cocos/renderer/gfx-gles2/GLES2Texture.cpp @@ -55,7 +55,7 @@ void GLES2Texture::doInit(const TextureInfo & /*info*/) { _gpuTexture->samples = _info.samples; _gpuTexture->flags = _info.flags; _gpuTexture->size = _size; - _gpuTexture->isPowerOf2 = math::IsPowerOfTwo(_info.width) && math::IsPowerOfTwo(_info.height); + _gpuTexture->isPowerOf2 = math::isPowerOfTwo(_info.width) && math::isPowerOfTwo(_info.height); _gpuTexture->glTexture = static_cast(reinterpret_cast(_info.externalRes)); cmdFuncGLES2CreateTexture(GLES2Device::getInstance(), _gpuTexture); diff --git a/native/cocos/renderer/gfx-gles3/GLES3CommandBuffer.cpp b/native/cocos/renderer/gfx-gles3/GLES3CommandBuffer.cpp index 74d5932464..49d92fb169 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3CommandBuffer.cpp +++ b/native/cocos/renderer/gfx-gles3/GLES3CommandBuffer.cpp @@ -175,8 +175,8 @@ void GLES3CommandBuffer::setViewport(const Viewport &vp) { (_curDynamicStates.viewport.top != vp.top) || (_curDynamicStates.viewport.width != vp.width) || (_curDynamicStates.viewport.height != vp.height) || - math::IsNotEqualF(_curDynamicStates.viewport.minDepth, vp.minDepth) || - math::IsNotEqualF(_curDynamicStates.viewport.maxDepth, vp.maxDepth)) { + math::isNotEqualF(_curDynamicStates.viewport.minDepth, vp.minDepth) || + math::isNotEqualF(_curDynamicStates.viewport.maxDepth, vp.maxDepth)) { _curDynamicStates.viewport = vp; _isStateInvalid = true; } @@ -193,16 +193,16 @@ void GLES3CommandBuffer::setScissor(const Rect &rect) { } void GLES3CommandBuffer::setLineWidth(float width) { - if (math::IsNotEqualF(_curDynamicStates.lineWidth, width)) { + if (math::isNotEqualF(_curDynamicStates.lineWidth, width)) { _curDynamicStates.lineWidth = width; _isStateInvalid = true; } } void GLES3CommandBuffer::setDepthBias(float constant, float clamp, float slope) { - if (math::IsNotEqualF(_curDynamicStates.depthBiasConstant, constant) || - math::IsNotEqualF(_curDynamicStates.depthBiasClamp, clamp) || - math::IsNotEqualF(_curDynamicStates.depthBiasSlope, slope)) { + if (math::isNotEqualF(_curDynamicStates.depthBiasConstant, constant) || + math::isNotEqualF(_curDynamicStates.depthBiasClamp, clamp) || + math::isNotEqualF(_curDynamicStates.depthBiasSlope, slope)) { _curDynamicStates.depthBiasConstant = constant; _curDynamicStates.depthBiasClamp = clamp; _curDynamicStates.depthBiasSlope = slope; @@ -211,10 +211,10 @@ void GLES3CommandBuffer::setDepthBias(float constant, float clamp, float slope) } void GLES3CommandBuffer::setBlendConstants(const Color &constants) { - if (math::IsNotEqualF(_curDynamicStates.blendConstant.x, constants.x) || - math::IsNotEqualF(_curDynamicStates.blendConstant.y, constants.y) || - math::IsNotEqualF(_curDynamicStates.blendConstant.z, constants.z) || - math::IsNotEqualF(_curDynamicStates.blendConstant.w, constants.w)) { + if (math::isNotEqualF(_curDynamicStates.blendConstant.x, constants.x) || + math::isNotEqualF(_curDynamicStates.blendConstant.y, constants.y) || + math::isNotEqualF(_curDynamicStates.blendConstant.z, constants.z) || + math::isNotEqualF(_curDynamicStates.blendConstant.w, constants.w)) { _curDynamicStates.blendConstant.x = constants.x; _curDynamicStates.blendConstant.y = constants.y; _curDynamicStates.blendConstant.z = constants.z; @@ -224,8 +224,8 @@ void GLES3CommandBuffer::setBlendConstants(const Color &constants) { } void GLES3CommandBuffer::setDepthBound(float minBounds, float maxBounds) { - if (math::IsNotEqualF(_curDynamicStates.depthMinBounds, minBounds) || - math::IsNotEqualF(_curDynamicStates.depthMaxBounds, maxBounds)) { + if (math::isNotEqualF(_curDynamicStates.depthMinBounds, minBounds) || + math::isNotEqualF(_curDynamicStates.depthMaxBounds, maxBounds)) { _curDynamicStates.depthMinBounds = minBounds; _curDynamicStates.depthMaxBounds = maxBounds; _isStateInvalid = true; diff --git a/native/cocos/renderer/gfx-gles3/GLES3Texture.cpp b/native/cocos/renderer/gfx-gles3/GLES3Texture.cpp index 334a23a666..fc152113b8 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3Texture.cpp +++ b/native/cocos/renderer/gfx-gles3/GLES3Texture.cpp @@ -56,7 +56,7 @@ void GLES3Texture::doInit(const TextureInfo & /*info*/) { _gpuTexture->samples = _info.samples; _gpuTexture->flags = _info.flags; _gpuTexture->size = _size; - _gpuTexture->isPowerOf2 = math::IsPowerOfTwo(_info.width) && math::IsPowerOfTwo(_info.height); + _gpuTexture->isPowerOf2 = math::isPowerOfTwo(_info.width) && math::isPowerOfTwo(_info.height); _gpuTexture->glTexture = static_cast(reinterpret_cast(_info.externalRes)); cmdFuncGLES3CreateTexture(GLES3Device::getInstance(), _gpuTexture); diff --git a/native/cocos/renderer/gfx-metal/MTLRenderCommandEncoder.h b/native/cocos/renderer/gfx-metal/MTLRenderCommandEncoder.h index 7056f5f780..3126252fad 100644 --- a/native/cocos/renderer/gfx-metal/MTLRenderCommandEncoder.h +++ b/native/cocos/renderer/gfx-metal/MTLRenderCommandEncoder.h @@ -177,9 +177,9 @@ public: inline void setDepthBias(float depthBias, float clamp, float slope) { if (_isDepthBiasSet && - math::IsEqualF(_depthBias, depthBias) && - math::IsEqualF(_clamp, clamp) && - math::IsEqualF(_slope, slope)) { + math::isEqualF(_depthBias, depthBias) && + math::isEqualF(_clamp, clamp) && + math::isEqualF(_slope, slope)) { return; } diff --git a/native/cocos/renderer/gfx-metal/MTLUtils.mm b/native/cocos/renderer/gfx-metal/MTLUtils.mm index 8cb0dc3571..846863812a 100644 --- a/native/cocos/renderer/gfx-metal/MTLUtils.mm +++ b/native/cocos/renderer/gfx-metal/MTLUtils.mm @@ -878,9 +878,9 @@ MTLSamplerAddressMode mu::toMTLSamplerAddressMode(Address mode) { int mu::toMTLSamplerBorderColor(const Color &color) { #if (CC_PLATFORM == CC_PLATFORM_MACOS) float diff = color.x - 0.5f; - if (math::IsEqualF(color.w, 0.f)) + if (math::isEqualF(color.w, 0.f)) return MTLSamplerBorderColorTransparentBlack; - else if (math::IsEqualF(diff, 0.f)) + else if (math::isEqualF(diff, 0.f)) return MTLSamplerBorderColorOpaqueBlack; else return MTLSamplerBorderColorOpaqueWhite; diff --git a/native/cocos/renderer/gfx-validator/DescriptorSetLayoutValidator.cpp b/native/cocos/renderer/gfx-validator/DescriptorSetLayoutValidator.cpp index de32db9a9e..a1f57af774 100644 --- a/native/cocos/renderer/gfx-validator/DescriptorSetLayoutValidator.cpp +++ b/native/cocos/renderer/gfx-validator/DescriptorSetLayoutValidator.cpp @@ -71,7 +71,7 @@ void DescriptorSetLayoutValidator::doInit(const DescriptorSetLayoutInfo &info) { for (const auto &binding : bindings) { CC_ASSERT(binding.binding != INVALID_BINDING); CC_ASSERT(binding.descriptorType != DescriptorType::UNKNOWN); - CC_ASSERT(math::IsPowerOfTwo(toNumber(binding.descriptorType))); + CC_ASSERT(math::isPowerOfTwo(toNumber(binding.descriptorType))); CC_ASSERT(binding.count); CC_ASSERT(binding.stageFlags != ShaderStageFlagBit::NONE); for (const Sampler *sampler : binding.immutableSamplers) { diff --git a/native/cocos/renderer/gfx-validator/DeviceValidator.cpp b/native/cocos/renderer/gfx-validator/DeviceValidator.cpp index 84a0da9712..71be99fd5f 100644 --- a/native/cocos/renderer/gfx-validator/DeviceValidator.cpp +++ b/native/cocos/renderer/gfx-validator/DeviceValidator.cpp @@ -270,11 +270,11 @@ Sampler *DeviceValidator::getSampler(const SamplerInfo &info) { GeneralBarrier *DeviceValidator::getGeneralBarrier(const GeneralBarrierInfo &info) { if (info.prevAccesses > AccessFlagBit::PRESENT) { // Write access should appear on its own. - CC_ASSERT(math::IsPowerOfTwo(toNumber(info.prevAccesses))); + CC_ASSERT(math::isPowerOfTwo(toNumber(info.prevAccesses))); } if (info.nextAccesses > AccessFlagBit::PRESENT) { // Write access should appear on its own. - CC_ASSERT(math::IsPowerOfTwo(toNumber(info.nextAccesses))); + CC_ASSERT(math::isPowerOfTwo(toNumber(info.nextAccesses))); } /////////// execute /////////// @@ -285,11 +285,11 @@ GeneralBarrier *DeviceValidator::getGeneralBarrier(const GeneralBarrierInfo &inf TextureBarrier *DeviceValidator::getTextureBarrier(const TextureBarrierInfo &info) { if (info.prevAccesses > AccessFlagBit::PRESENT) { // Write access should appear on its own. - CC_ASSERT(math::IsPowerOfTwo(toNumber(info.prevAccesses))); + CC_ASSERT(math::isPowerOfTwo(toNumber(info.prevAccesses))); } if (info.nextAccesses > AccessFlagBit::PRESENT) { // Write access should appear on its own. - CC_ASSERT(math::IsPowerOfTwo(toNumber(info.nextAccesses))); + CC_ASSERT(math::isPowerOfTwo(toNumber(info.nextAccesses))); } /////////// execute /////////// diff --git a/native/cocos/renderer/gfx-vulkan/VKCommandBuffer.cpp b/native/cocos/renderer/gfx-vulkan/VKCommandBuffer.cpp index 0402fbfceb..921d194022 100644 --- a/native/cocos/renderer/gfx-vulkan/VKCommandBuffer.cpp +++ b/native/cocos/renderer/gfx-vulkan/VKCommandBuffer.cpp @@ -278,16 +278,16 @@ void CCVKCommandBuffer::setScissor(const Rect &rect) { } void CCVKCommandBuffer::setLineWidth(float width) { - if (math::IsNotEqualF(_curDynamicStates.lineWidth, width)) { + if (math::isNotEqualF(_curDynamicStates.lineWidth, width)) { _curDynamicStates.lineWidth = width; vkCmdSetLineWidth(_gpuCommandBuffer->vkCommandBuffer, width); } } void CCVKCommandBuffer::setDepthBias(float constant, float clamp, float slope) { - if (math::IsNotEqualF(_curDynamicStates.depthBiasConstant, constant) || - math::IsNotEqualF(_curDynamicStates.depthBiasClamp, clamp) || - math::IsNotEqualF(_curDynamicStates.depthBiasSlope, slope)) { + if (math::isNotEqualF(_curDynamicStates.depthBiasConstant, constant) || + math::isNotEqualF(_curDynamicStates.depthBiasClamp, clamp) || + math::isNotEqualF(_curDynamicStates.depthBiasSlope, slope)) { _curDynamicStates.depthBiasConstant = constant; _curDynamicStates.depthBiasClamp = clamp; _curDynamicStates.depthBiasSlope = slope; @@ -296,10 +296,10 @@ void CCVKCommandBuffer::setDepthBias(float constant, float clamp, float slope) { } void CCVKCommandBuffer::setBlendConstants(const Color &constants) { - if (math::IsNotEqualF(_curDynamicStates.blendConstant.x, constants.x) || - math::IsNotEqualF(_curDynamicStates.blendConstant.y, constants.y) || - math::IsNotEqualF(_curDynamicStates.blendConstant.z, constants.z) || - math::IsNotEqualF(_curDynamicStates.blendConstant.w, constants.w)) { + if (math::isNotEqualF(_curDynamicStates.blendConstant.x, constants.x) || + math::isNotEqualF(_curDynamicStates.blendConstant.y, constants.y) || + math::isNotEqualF(_curDynamicStates.blendConstant.z, constants.z) || + math::isNotEqualF(_curDynamicStates.blendConstant.w, constants.w)) { _curDynamicStates.blendConstant.x = constants.x; _curDynamicStates.blendConstant.y = constants.y; _curDynamicStates.blendConstant.z = constants.z; @@ -309,8 +309,8 @@ void CCVKCommandBuffer::setBlendConstants(const Color &constants) { } void CCVKCommandBuffer::setDepthBound(float minBounds, float maxBounds) { - if (math::IsNotEqualF(_curDynamicStates.depthMinBounds, minBounds) || - math::IsNotEqualF(_curDynamicStates.depthMaxBounds, maxBounds)) { + if (math::isNotEqualF(_curDynamicStates.depthMinBounds, minBounds) || + math::isNotEqualF(_curDynamicStates.depthMaxBounds, maxBounds)) { _curDynamicStates.depthMinBounds = minBounds; _curDynamicStates.depthMaxBounds = maxBounds; vkCmdSetDepthBounds(_gpuCommandBuffer->vkCommandBuffer, minBounds, maxBounds); diff --git a/native/cocos/renderer/pipeline/ClusterLightCulling.h b/native/cocos/renderer/pipeline/ClusterLightCulling.h index bc352b23e0..7ebbe2ce63 100644 --- a/native/cocos/renderer/pipeline/ClusterLightCulling.h +++ b/native/cocos/renderer/pipeline/ClusterLightCulling.h @@ -78,7 +78,7 @@ private: static bool isProjMatChange(const Mat4 &curProj, const Mat4 &oldProj) { for (uint32_t i = 0; i < sizeof(curProj.m) / sizeof(float); i++) { - if (math::IsNotEqualF(curProj.m[i], oldProj.m[i])) { + if (math::isNotEqualF(curProj.m[i], oldProj.m[i])) { return true; } } diff --git a/native/cocos/renderer/pipeline/Define.h b/native/cocos/renderer/pipeline/Define.h index 6a09891526..ef086b76b6 100644 --- a/native/cocos/renderer/pipeline/Define.h +++ b/native/cocos/renderer/pipeline/Define.h @@ -171,7 +171,7 @@ inline bool opaqueCompareFn(const RenderPass &a, const RenderPass &b) { return a.hash < b.hash; } - if (math::IsNotEqualF(a.depth, b.depth)) { + if (math::isNotEqualF(a.depth, b.depth)) { return a.depth < b.depth; } @@ -182,12 +182,12 @@ inline bool transparentCompareFn(const RenderPass &a, const RenderPass &b) { if (a.priority != b.priority) { return a.priority < b.priority; } - + if (a.hash != b.hash) { return a.hash < b.hash; } - if (math::IsNotEqualF(a.depth, b.depth)) { + if (math::isNotEqualF(a.depth, b.depth)) { return b.depth < a.depth; } @@ -350,7 +350,7 @@ struct CC_DLL UBOSkinning { static const gfx::DescriptorSetLayoutBinding DESCRIPTOR; static gfx::UniformBlock layout; static const ccstd::string NAME; - static void initLayout (uint capacity); + static void initLayout(uint capacity); }; struct CC_DLL UBOMorph { @@ -420,7 +420,7 @@ struct CC_DLL UBOGlobal { static constexpr uint32_t DEBUG_VIEW_COMPOSITE_PACK_1_OFFSET = UBOGlobal::DEBUG_VIEW_MODE_OFFSET + 4; static constexpr uint32_t DEBUG_VIEW_COMPOSITE_PACK_2_OFFSET = UBOGlobal::DEBUG_VIEW_COMPOSITE_PACK_1_OFFSET + 4; static constexpr uint32_t DEBUG_VIEW_COMPOSITE_PACK_3_OFFSET = UBOGlobal::DEBUG_VIEW_COMPOSITE_PACK_2_OFFSET + 4; - + static constexpr uint32_t COUNT = UBOGlobal::DEBUG_VIEW_COMPOSITE_PACK_3_OFFSET + 4; static constexpr uint32_t SIZE = UBOGlobal::COUNT * 4; @@ -516,9 +516,9 @@ const uint32_t CAMERA_DEFAULT_MASK = ~static_cast(LayerList::UI_2D) & uint32_t nextPow2(uint32_t val); -bool supportsR16HalfFloatTexture(const gfx::Device* device); +bool supportsR16HalfFloatTexture(const gfx::Device *device); -bool supportsR32FloatTexture(const gfx::Device* device); +bool supportsR32FloatTexture(const gfx::Device *device); extern CC_DLL uint32_t skyboxFlag; diff --git a/native/tests/unit-test/src/utils.h b/native/tests/unit-test/src/utils.h index da80d6c298..b1d988e7ca 100644 --- a/native/tests/unit-test/src/utils.h +++ b/native/tests/unit-test/src/utils.h @@ -30,7 +30,7 @@ THE SOFTWARE. static std::string logLabel; static bool IsEqualF(float l, float r) { - return cc::math::IsEqualF(l, r); + return cc::math::isEqualF(l, r); }; static void ExpectEq(bool lf, bool rt) { EXPECT_EQ(lf, rt) << "ERROR in: " << logLabel; diff --git a/native/utils/generate_compile_commands_android.sh b/native/utils/generate_compile_commands_android.sh index d1ed631e49..7d156c0cc9 100755 --- a/native/utils/generate_compile_commands_android.sh +++ b/native/utils/generate_compile_commands_android.sh @@ -28,6 +28,8 @@ cmake -Sbuild -Bbuild -DCC_USE_GLES2=ON -DCC_USE_VULKAN=ON -DCC_USE_GLES3=ON \ -DCMAKE_TOOLCHAIN_FILE="$ndk_path/build/cmake/android.toolchain.cmake" \ -DANDROID_PLATFORM=android-21 \ -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_C_FLAGS="-mfpu=neon-fp16" \ + -DCMAKE_CXX_FLAGS="-mfpu=neon-fp16" \ -G "$GENERATER" $MAKE_BIN cp build/compile_commands.json . \ No newline at end of file diff --git a/templates/cmake/android.cmake b/templates/cmake/android.cmake index 4eb9ddba77..cbcadf09da 100644 --- a/templates/cmake/android.cmake +++ b/templates/cmake/android.cmake @@ -5,6 +5,12 @@ macro(cc_android_before_target target_name) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -ffunction-sections -fdata-sections -fstrict-aliasing") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -ffunction-sections -fdata-sections -fstrict-aliasing -frtti -fexceptions") + +if("${ANDROID_ABI}" STREQUAL "armeabi-v7a") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon-fp16") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon-fp16") +endif() + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fvisibility=default -fno-omit-frame-pointer") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fvisibility=hidden") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=default -fno-omit-frame-pointer")