From a91d8140c729fc4b36cd4adb05795e29d0dab344 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Mon, 9 Nov 2020 13:20:24 +0800
Subject: [PATCH] update GetUUIDCachePath function, use ComboFilename function.

---
 CMCore                               |  2 +-
 src/RenderDevice/VKPipelineCache.cpp | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CMCore b/CMCore
index ad4b2cd4..28bf928b 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit ad4b2cd48c9744c3a5e2fed29a15a79d7a5d35b3
+Subproject commit 28bf928b3b7bc78c601ad2224bff487f3751e882
diff --git a/src/RenderDevice/VKPipelineCache.cpp b/src/RenderDevice/VKPipelineCache.cpp
index 2ced7ff4..c9b9ce5e 100644
--- a/src/RenderDevice/VKPipelineCache.cpp
+++ b/src/RenderDevice/VKPipelineCache.cpp
@@ -1,5 +1,7 @@
 #include<hgl/graph/VK.h>
 #include<hgl/filesystem/FileSystem.h>
+#include<hgl/type/StringList.h>
+#include<hgl/type/StrChar.h>
 
 VK_NAMESPACE_BEGIN
 namespace
@@ -9,17 +11,18 @@ namespace
     const OSString GetUUIDCachePath(const VkPhysicalDeviceProperties &pdp)
     {
         OSString app_data;
-        OSString pathname;
         
         if(!GetLocalAppdataPath(app_data))return OS_TEXT("");
 
-        pathname=app_data+HGL_DIRECTORY_SEPARATOR
-                +OSString(OS_TEXT("VkPipelineCache.com"))+HGL_DIRECTORY_SEPARATOR
-                +OSString::valueOf(VK_PIPELINE_CACHE_HEADER_VERSION_ONE)+HGL_DIRECTORY_SEPARATOR
-                +OSString::valueOf(pdp.vendorID)+HGL_DIRECTORY_SEPARATOR
-                +OSString::valueOf(pdp.deviceID)+HGL_DIRECTORY_SEPARATOR;
+        OSStringList sl;
 
-        return pathname;
+        sl.Add(app_data);
+        sl.Add(OS_TEXT("VkPipelineCache.com"));
+        sl.Add(OSString::valueOf(VK_PIPELINE_CACHE_HEADER_VERSION_ONE));
+        sl.Add(OSString::valueOf(pdp.vendorID));
+        sl.Add(OSString::valueOf(pdp.deviceID));
+
+        return ComboFilename(sl);
     }
 
     void LoadPipelineCacheFile(VkPipelineCacheCreateInfo *pcci,const VkPhysicalDeviceProperties &pdp)