feat: 引入 rapidhash，不再使用 wyhash

这会使效果缓存失效
Blinue · Jan 2, 2025 · 1424ddc · 1424ddc
1 parent ca68838
commit 1424ddc
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 106 deletions.
diff --git a/src/Magpie.Core/EffectCacheManager.cpp b/src/Magpie.Core/EffectCacheManager.cpp
@@ -5,7 +5,7 @@
 #include "Logger.h"
 #include "CommonSharedConstants.h"
 #include <d3dcompiler.h>
-#include "FastHasher.h"
+#include <rapidhash.h>
 #include "YasHelper.h"
 
 namespace yas::detail {
@@ -239,7 +239,7 @@ void EffectCacheManager::Save(std::wstring_view effectName, uint32_t flags, std:
 }
 
 static std::wstring HexHash(std::span<const BYTE> data) {
-	uint64_t hashBytes = FastHasher::HashData(data);
+	uint64_t hashBytes = rapidhash(data.data(), data.size());
 
 	static wchar_t oct2Hex[16] = {
 		L'0',L'1',L'2',L'3',L'4',L'5',L'6',L'7',

diff --git a/src/Magpie.Core/EffectCompiler.cpp b/src/Magpie.Core/EffectCompiler.cpp
@@ -1042,7 +1042,6 @@ static uint32_t GeneratePassSource(
 	std::string_view cbHlsl,
 	const SmallVector<std::string_view>& commonBlocks,
 	std::string_view passBlock,
-	const phmap::flat_hash_map<std::wstring, float>* inlineParams,
 	std::string& result,
 	std::vector<std::pair<std::string, std::string>>& macros
 ) {
@@ -1392,7 +1391,7 @@ static uint32_t CompilePasses(
 	Win32Helper::RunParallel([&](uint32_t id) {
 		std::string source;
 		std::vector<std::pair<std::string, std::string>> macros;
-		if (GeneratePassSource(desc, id + 1, cbHlsl, commonBlocks, passBlocks[id], inlineParams, source, macros)) {
+		if (GeneratePassSource(desc, id + 1, cbHlsl, commonBlocks, passBlocks[id], source, macros)) {
 			Logger::Get().Error(fmt::format("生成 Pass{} 失败", id + 1));
 			return;
 		}

diff --git a/src/Magpie.Core/FastHasher.cpp b/src/Magpie.Core/FastHasher.cpp
diff --git a/src/Magpie.Core/FastHasher.h b/src/Magpie.Core/FastHasher.h
diff --git a/src/Magpie.Core/Magpie.Core.vcxproj b/src/Magpie.Core/Magpie.Core.vcxproj
@@ -60,7 +60,6 @@
     <ClInclude Include="EffectHelper.h" />
     <ClInclude Include="EffectsProfiler.h" />
     <ClInclude Include="ExclModeHelper.h" />
-    <ClInclude Include="FastHasher.h" />
     <ClInclude Include="FrameSourceBase.h" />
     <ClInclude Include="GDIFrameSource.h" />
     <ClInclude Include="GraphicsCaptureFrameSource.h" />
@@ -125,7 +124,6 @@
     <ClCompile Include="StepTimer.cpp" />
     <ClCompile Include="StrHelper.cpp" />
     <ClCompile Include="TextureLoader.cpp" />
-    <ClCompile Include="FastHasher.cpp" />
     <ClCompile Include="Version.cpp" />
     <ClCompile Include="Win32Helper.cpp" />
     <ClCompile Include="WindowHelper.cpp" />

diff --git a/src/Magpie.Core/Magpie.Core.vcxproj.filters b/src/Magpie.Core/Magpie.Core.vcxproj.filters
@@ -110,7 +110,6 @@
     <ClInclude Include="include\WindowBase.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="FastHasher.h" />
     <ClInclude Include="StepTimer.h" />
     <ClInclude Include="include\ScalingError.h">
       <Filter>Include</Filter>
@@ -184,7 +183,6 @@
     <ClCompile Include="ExclModeHelper.cpp" />
     <ClCompile Include="ScalingOptions.cpp" />
     <ClCompile Include="SmallVector.cpp" />
-    <ClCompile Include="FastHasher.cpp" />
     <ClCompile Include="Version.cpp" />
     <ClCompile Include="Logger.cpp" />
     <ClCompile Include="Win32Helper.cpp">

diff --git a/src/Magpie/conanfile.txt b/src/Magpie/conanfile.txt
@@ -7,6 +7,7 @@ kuba-zip/0.3.2
 muparser/2.3.4
 yas/7.1.0
 imgui/1.91.5
+rapidhash/1.0
 
 [generators]
 MSBuildDeps