Merge branch 'cleanup' into 'main'

Cleaning up some unused values.

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

Author: MarkEHenderson

RtxOptions.md

@@ -65,7 +65,7 @@ Tables below enumerate all the options and their defaults set by RTX Remix. Note
 |rtx.antiCulling.light.enable|bool|False|||Enable Anti\-Culling for lights\.|
 |rtx.antiCulling.light.fovScale|float|1|||Scalar of the FOV of lights Anti\-Culling Frustum\.|
 |rtx.antiCulling.light.numFramesToExtendLightLifetime|int|1000|||Maximum number of frames to keep  when Anti\-Culling is enabled\. Make sure not to set this too low \(then the anti\-culling won't work\), nor too high \(which will hurt the performance\)\.|
-|rtx.antiCulling.light.numLightsToKeep|int|1000|||Maximum number of lights to keep when Anti\-Culling is enabled\.|
+|rtx.antiCulling.light.numLightsToKeep|int|1000|||\(DEPRECATED\)|
 |rtx.antiCulling.object.enable|bool|False|||Extends lifetime of objects that go outside the camera frustum \(anti\-culling frustum\)\.|
 |rtx.antiCulling.object.enableHighPrecisionAntiCulling|bool|True|||Use robust intersection check with Separate Axis Theorem\.<br>This method is slightly expensive but it effectively addresses object flickering issues that arise from corner cases in the fast intersection check method\.<br>Typically, it's advisable to enable this option unless it results in a notable performance drop; otherwise, the presence of flickering artifacts could significantly diminish the overall image quality\.|
 |rtx.antiCulling.object.enableInfinityFarFrustum|bool|False|||Enable infinity far plane frustum for anti\-culling\.|

src/dxvk/rtx_render/graph/rtx_graph_manager.h

@@ -53,7 +53,7 @@ class GraphManager {
     });
   }
 
-  GraphInstance* addInstance(Rc<DxvkContext> context, const RtGraphState& graphState, ReplacementInstance* replacementInstance) {
+  GraphInstance* addInstance(Rc<DxvkContext> context, const RtGraphState& graphState) {
     ScopedCpuProfileZone();
     auto iter = m_batches.find(graphState.topology.graphHash);
     if (iter == m_batches.end()) {

src/dxvk/rtx_render/rtx_light_manager.cpp

@@ -121,7 +121,6 @@ namespace dxvk {
     const uint32_t framesToKeep = RtxOptions::numFramesToKeepLights();
     const uint32_t framesToSleep = RtxOptions::getNumFramesToPutLightsToSleep();
 
-    const bool forceGarbageCollection = (m_lights.size() >= RtxOptions::AntiCulling::Light::numLightsToKeep());
     for (auto it = m_lights.begin(); it != m_lights.end();) {
       const RtLight& light = it->second;
       if (light.isMarkedForGarbageCollection()) {

src/dxvk/rtx_render/rtx_options.h

@@ -571,7 +571,7 @@ namespace dxvk {
         friend class ImGUI;
         friend class RtxOptions;
         RTX_OPTION_ENV("rtx.antiCulling.light", bool, enable, false, "RTX_ANTI_CULLING_LIGHTS", "Enable Anti-Culling for lights.");
-        RTX_OPTION("rtx.antiCulling.light", uint32_t, numLightsToKeep, 1000, "Maximum number of lights to keep when Anti-Culling is enabled.");
+        RTX_OPTION("rtx.antiCulling.light", uint32_t, numLightsToKeep, 1000, "(DEPRECATED)");
         RTX_OPTION("rtx.antiCulling.light", uint32_t, numFramesToExtendLightLifetime, 1000, "Maximum number of frames to keep  when Anti-Culling is enabled. Make sure not to set this too low (then the anti-culling won't work), nor too high (which will hurt the performance).");
         RTX_OPTION("rtx.antiCulling.light", float, fovScale, 1.0f, "Scalar of the FOV of lights Anti-Culling Frustum.");
       };

src/dxvk/rtx_render/rtx_scene_manager.cpp

@@ -781,7 +781,7 @@ namespace dxvk {
           ));
           break;
         }
-        GraphInstance* graphInstance = m_graphManager.addInstance(ctx, replacement.graphState.value(), replacementInstance);
+        GraphInstance* graphInstance = m_graphManager.addInstance(ctx, replacement.graphState.value());
         if (graphInstance) {
           graphInstance->getPrimInstanceOwner().setReplacementInstance(replacementInstance, i, graphInstance, PrimInstance::Type::Graph);
         }

src/dxvk/rtx_render/rtx_types.h

@@ -63,9 +63,6 @@ class PrimInstance {
     Graph,
     None
   };
-  // set to 0 because the Id is based on a pointer value, so the id of an empty Entity is nullptr.
-  static constexpr uint64_t kEmptyId = 0;
-
   // Use `Entity()` to create a nullptr Entity.
   PrimInstance() {}