Cache-point based GI

game/commandline.cpp

@@ -40,6 +40,12 @@ static bool boolArg(std::string_view v) {
   return std::string_view(v)!="0" && std::string_view(v)!="false";
   }
 
+static int intArg(std::string_view v) {
+  if(v=="false")
+    return 0;
+  return (std::stoi(std::string(v)));
+  }
+
 CommandLine::CommandLine(int argc, const char** argv) {
   instance = this;
   if(argc<1)
@@ -114,8 +120,8 @@ CommandLine::CommandLine(int argc, const char** argv) {
       ++i;
       if(i<argc) {
         try {
-          aaPresetId = uint32_t(std::stoul(std::string(argv[i])));
-          aaPresetId = std::clamp(aaPresetId, 0u, uint32_t(AaPreset::PRESETS_COUNT)-1u);
+          const int arg = std::max(0, intArg(argv[i]));
+          aaPresetId = std::clamp(uint32_t(arg), 0u, uint32_t(AaPreset::PRESETS_COUNT)-1u);
           }
         catch (const std::exception& e) {
           Log::i("failed to read cmaa2 preset: \"", std::string(argv[i]), "\"");
@@ -124,8 +130,10 @@ CommandLine::CommandLine(int argc, const char** argv) {
       }
     else if(arg=="-gi") {
       ++i;
-      if(i<argc)
-        isGi = boolArg(argv[i]);
+      if(i<argc) {
+        const int arg = std::max(0, intArg(argv[i]));
+        isGi = GiMethod(std::clamp(arg, 0, GiMethod::Count-1));
+        }
       }
     else if(arg=="-ms") {
       ++i;

game/commandline.h

@@ -36,7 +36,7 @@ class CommandLine {
     bool                isValidationMode() const { return isDebug;      }
     bool                isWindowMode()     const { return isWindow;     }
     bool                isRayQuery()       const { return isRQuery;     }
-    bool                isRtGi()           const { return isGi;         }
+    GiMethod            isRtGi()           const { return isGi;         }
     bool                isMeshShading()    const { return isMeshSh;     }
     bool                isBindless()       const { return isBindlessSh; }
     bool                isVirtualShadow()  const { return isVsm;        }
@@ -74,7 +74,7 @@ class CommandLine {
     bool                isBindlessSh = true;
     bool                isVsm        = false;
     bool                isRtSm       = false;
-    bool                isGi         = false;
+    GiMethod            isGi         = GiMethod::None;
     bool                forceG1      = false;
     bool                forceG2      = false;
     bool                forceG2NR    = false;

game/game/constants.h

@@ -540,3 +540,10 @@ enum class Benchmark : uint8_t {
   Normal,
   CiTooling
   };
+
+enum GiMethod : uint8_t {
+  None,
+  Probes, // legacy
+  IrrC,
+  Count
+  };

game/gothic.cpp

@@ -84,7 +84,7 @@ Gothic::Gothic() {
   auto& gpu = Resources::device().properties();
   if(gpu.raytracing.rayQuery) {
     opts.doRayQuery = CommandLine::inst().isRayQuery();
-    opts.doRtGi     = opts.doRayQuery && CommandLine::inst().isRtGi();
+    opts.doGi       = CommandLine::inst().isRtGi();
     }
 
   if(hasMeshShader()) {

game/gothic.h

@@ -43,7 +43,7 @@ class Gothic final {
 
     struct Options {
       bool     doRayQuery        = false;
-      bool     doRtGi            = false;
+      GiMethod doGi              = GiMethod::None;
       bool     doMeshShading     = false;
       bool     doBindless        = false;
       bool     doVirtualShadow   = false;