Merge branch 'rtxOptions1' into 'main'

[REMIX-715] Refactor RtxOptions to use hashes as keys

See merge request lightspeedrtx/dxvk-remix-nv!1116

Author: MarkEHenderson

src/dxvk/rtx_render/rtx_game_capturer.cpp

@@ -1023,7 +1023,7 @@ namespace dxvk {
     exportPrep.meta.isZUp = RtxOptions::Get()->isZUp();
     if (s_captureRemixConfigs) {
       for (auto& pair : RtxOptionImpl::getGlobalRtxOptionMap()) {
-        exportPrep.meta.renderingSettingsDict[pair.first] = pair.second->genericValueToString(RtxOptionImpl::ValueType::Value);
+        exportPrep.meta.renderingSettingsDict[pair.second->getFullName()] = pair.second->genericValueToString(RtxOptionImpl::ValueType::Value);
       }
     }
     exportPrep.meta.bCorrectBakedTransforms = false;

src/dxvk/rtx_render/rtx_mod_usd.cpp

@@ -146,8 +146,8 @@ XXH64_hash_t getStrongestOpinionatedPathHash(const pxr::UsdPrim& prim) {
       std::string originPath = spec->GetPath().GetString();
 
       XXH64_hash_t usdOriginHash = 0;
-      usdOriginHash = XXH64(originOfMeshFile.c_str(), originOfMeshFile.size(), usdOriginHash);
-      usdOriginHash = XXH64(originPath.c_str(), originPath.size(), usdOriginHash);
+      usdOriginHash = StringToXXH64(originOfMeshFile, usdOriginHash);
+      usdOriginHash = StringToXXH64(originPath, usdOriginHash);
 
       return usdOriginHash;
     }

src/dxvk/rtx_render/rtx_option.cpp

@@ -379,8 +379,19 @@ Tables below enumerate all the options and their defaults set by RTX Remix. Note
 
       // Write out all RTX Options
       auto& globalRtxOptions = getGlobalRtxOptionMap();
+
+      // Need to sort the options alphabetically by full name.
+      std::vector<RtxOptionImpl*> sortedOptions;
+      sortedOptions.reserve(globalRtxOptions.size());
       for (const auto& rtxOptionMapEntry : globalRtxOptions) {
-        const RtxOptionImpl& rtxOption = *rtxOptionMapEntry.second.get();
+        sortedOptions.push_back(rtxOptionMapEntry.second.get());
+      }  
+      std::sort(sortedOptions.begin(), sortedOptions.end(), [](RtxOptionImpl* a, RtxOptionImpl* b) {
+        return a->getFullName() < b->getFullName();
+      });
+
+      for (const RtxOptionImpl* rtxOptionsPtr : sortedOptions) {
+        const RtxOptionImpl& rtxOption = *rtxOptionsPtr;
 
         // Allow processing of short or long value entry categories separately
         {

src/dxvk/rtx_render/rtx_option.h

@@ -72,7 +72,7 @@ namespace dxvk {
   };
 
   struct RtxOptionImpl {
-    using RtxOptionMap = std::map<std::string, std::shared_ptr<RtxOptionImpl>>;
+    using RtxOptionMap = std::map<XXH64_hash_t, std::shared_ptr<RtxOptionImpl>>;
     enum class ValueType {
       Value = 0,
       DefaultValue = 1,
@@ -260,12 +260,13 @@ namespace dxvk {
   private:
     bool allocateMemory(const char* category, const char* name, const char* environment, uint32_t flags, const char* description) {
       const std::string fullName = RtxOptionImpl::getFullName(category, name);
+      const XXH64_hash_t optionHash = StringToXXH64(fullName, 0);
       auto& globalRtxOptions = RtxOptionImpl::getGlobalRtxOptionMap();
-      auto pOption = globalRtxOptions.find(fullName);
+      auto pOption = globalRtxOptions.find(optionHash);
       if (pOption == globalRtxOptions.end()) {
         // Cannot find existing object, make a new one
         pImpl = std::make_shared<RtxOptionImpl>(name, category, environment, getOptionType(), flags, description);
-        globalRtxOptions[fullName] = pImpl;
+        globalRtxOptions[optionHash] = pImpl;
         return true;
       } else {
         // If the variable already exists, use the existing object

src/dxvk/rtx_render/rtx_remix_api.cpp

@@ -996,7 +996,8 @@ namespace {
     std::string strKey = std::string{ key };
 
     const auto& globalRtxOptions = dxvk::RtxOptionImpl::getGlobalRtxOptionMap();
-    auto found = globalRtxOptions.find(strKey);
+    const XXH64_hash_t optionHash = dxvk::StringToXXH64(strKey, 0);
+    auto found = globalRtxOptions.find(optionHash);
     if (found == globalRtxOptions.end()) {
       return REMIXAPI_ERROR_CODE_GENERAL_FAILURE;
     }

src/dxvk/rtx_render/rtx_utils.h

@@ -87,6 +87,10 @@ inline const std::string hashToString(XXH64_hash_t hash) {
   return ss.str();
 }
 
+inline const XXH64_hash_t StringToXXH64(const std::string& str, const XXH64_hash_t seed) {
+  return XXH64(str.c_str(), str.size(), seed);
+}
+
 enum BufferType {
   Raster = 0,
   Raytrace