Merge branch 'layer-merging-fix' into 'main'

[REMIX-4752] fix early termination from below threshold layers.

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

Author: MarkEHenderson

src/dxvk/rtx_render/rtx_option.cpp

@@ -843,18 +843,20 @@ namespace dxvk {
 
         addWeightedValue(optionLayer.second.value, optionLayer.second.blendStrength * throughput, optionValue.data);
         throughput *= (1.0f - optionLayer.second.blendStrength);
-      } else {
-        addWeightedValue(optionLayer.second.value, throughput, optionValue.data);
 
-        // For non-collection-like types, we always break after applying the weight
-        if (type != OptionType::HashSet && type != OptionType::HashVector && type != OptionType::IntVector) {
+        if (throughput < 0.0001f) {
           break;
         }
-
-        // For collection-like types, we only continue if the blend strength is high then threshold
+      } else {
         if (optionLayer.second.blendStrength < optionLayer.second.blendThreshold) {
+          continue;
+        }
+        addWeightedValue(optionLayer.second.value, throughput, optionValue.data);
+        // For non-collection-like types, we always break after applying the weight
+        if (type != OptionType::HashSet && type != OptionType::HashVector && type != OptionType::IntVector) {
           break;
         }
+        
       }
     }