rename

cocos · Oct 16, 2024 · 1c2dd60 · 1c2dd60
1 parent e8da8bd
commit 1c2dd60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/native/cocos/renderer/gfx-base/GFXDef.cpp b/native/cocos/renderer/gfx-base/GFXDef.cpp
@@ -204,7 +204,7 @@ bool operator==(const BufferInfo &lhs, const BufferInfo &rhs) {
 
 template <>
 ccstd::hash_t Hasher<SamplerInfo>::operator()(const SamplerInfo &info) const {
-    return static_cast<ccstd::hash_t>(compressSamplerInfo(info));
+    return static_cast<ccstd::hash_t>(packSamplerInfo(info));
 }
 
 bool operator==(const SamplerInfo &lhs, const SamplerInfo &rhs) {

diff --git a/native/cocos/renderer/gfx-base/GFXSamplerUtils.h b/native/cocos/renderer/gfx-base/GFXSamplerUtils.h
@@ -28,7 +28,7 @@
 namespace cc {
 namespace gfx {
 
-constexpr uint32_t compressSamplerInfo(const SamplerInfo &info) noexcept {
+constexpr uint32_t packSamplerInfo(const SamplerInfo &info) noexcept {
     CC_ASSERT(static_cast<uint32_t>(info.minFilter) < (1 << 2));
     CC_ASSERT(static_cast<uint32_t>(info.magFilter) < (1 << 2));
     CC_ASSERT(static_cast<uint32_t>(info.mipFilter) < (1 << 2));
@@ -49,7 +49,7 @@ constexpr uint32_t compressSamplerInfo(const SamplerInfo &info) noexcept {
     return packed;
 }
 
-constexpr SamplerInfo uncompressSamplerInfo(const uint32_t packed) noexcept {
+constexpr SamplerInfo unpackSamplerInfo(const uint32_t packed) noexcept {
     SamplerInfo info{};
     info.minFilter = static_cast<Filter>(packed & ((1 << 2) - 1));
     info.magFilter = static_cast<Filter>((packed >> 2) & ((1 << 2) - 1));

diff --git a/native/cocos/renderer/gfx-base/states/GFXSampler.cpp b/native/cocos/renderer/gfx-base/states/GFXSampler.cpp
@@ -39,14 +39,14 @@ ccstd::hash_t Sampler::computeHash(const SamplerInfo &info) {
 }
 
 SamplerInfo Sampler::unpackFromHash(ccstd::hash_t hash) {
-    return uncompressSamplerInfo(hash);
+    return unpackSamplerInfo(hash);
 }
 
 namespace {
 
 constexpr bool testSamplerInfo(const SamplerInfo &info) {
-    const uint32_t packed = compressSamplerInfo(info);
-    const SamplerInfo unpacked = uncompressSamplerInfo(packed);
+    const uint32_t packed = packSamplerInfo(info);
+    const SamplerInfo unpacked = unpackSamplerInfo(packed);
 
     return info.minFilter == unpacked.minFilter &&
            info.magFilter == unpacked.magFilter &&