From f0d2ce4683abc5eece182802a6b78a3c6ec579f6 Mon Sep 17 00:00:00 2001 From: Zopolis4 Date: Mon, 8 Aug 2022 10:18:36 +1000 Subject: Remove _M_X86 in favour of _M_X86_64 --- Source/Core/Common/Hash.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/Hash.cpp') diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index 51182a0463..683efc54fc 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -359,7 +359,7 @@ static u64 GetHash64_SSE42_CRC32(const u8* src, u32 len, u32 samples) return h[0] + (h[1] << 10) + (h[2] << 21) + (h[3] << 32); } -#elif defined(_M_X86) +#elif defined(_M_X86_64) FUNCTION_TARGET_SSE42 static u64 GetHash64_SSE42_CRC32(const u8* src, u32 len, u32 samples) @@ -433,7 +433,7 @@ static u64 SetHash64Function(const u8* src, u32 len, u32 samples) { if (cpu_info.bCRC32) { -#if defined(_M_X86_64) || defined(_M_X86) +#if defined(_M_X86_64) s_texture_hash_func = &GetHash64_SSE42_CRC32; #elif defined(_M_ARM_64) s_texture_hash_func = &GetHash64_ARMv8_CRC32; -- cgit v1.2.3 From 481bc76d8e1c37d7722471311eb010df2b238f34 Mon Sep 17 00:00:00 2001 From: Zopolis4 Date: Fri, 19 Aug 2022 18:33:17 +1000 Subject: Remove redundant 32-bit code --- Source/Core/Common/Hash.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'Source/Core/Common/Hash.cpp') diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index 683efc54fc..8cb697b695 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -359,30 +359,6 @@ static u64 GetHash64_SSE42_CRC32(const u8* src, u32 len, u32 samples) return h[0] + (h[1] << 10) + (h[2] << 21) + (h[3] << 32); } -#elif defined(_M_X86_64) - -FUNCTION_TARGET_SSE42 -static u64 GetHash64_SSE42_CRC32(const u8* src, u32 len, u32 samples) -{ - u32 h = len; - u32 Step = (len / 4); - const u32* data = (const u32*)src; - const u32* end = data + Step; - if (samples == 0) - samples = std::max(Step, 1u); - Step = Step / samples; - if (Step < 1) - Step = 1; - while (data < end) - { - h = _mm_crc32_u32(h, data[0]); - data += Step; - } - - const u8* data2 = (const u8*)end; - return (u64)_mm_crc32_u32(h, u32(data2[0])); -} - #elif defined(_M_ARM_64) static u64 GetHash64_ARMv8_CRC32(const u8* src, u32 len, u32 samples) -- cgit v1.2.3