refactor rest of graphics settings

Author: Try

common/gothic.cpp

@@ -67,11 +67,6 @@ Gothic::Gothic() {
   setBenchmarkMode(CommandLine::inst().isBenchmarkMode());
 
   auto& gpu = Resources::device().properties();
-  if(gpu.raytracing.rayQuery) {
-    opts.doGi = CommandLine::inst().isRtGi();
-    }
-
-  opts.aaPreset = CommandLine::inst().aaPreset();
 
   wrldDef = CommandLine::inst().wrldDef;
 

common/gothic.h

@@ -42,9 +42,6 @@ class Gothic final {
       };
 
     struct Options {
-      GiMethod doGi              = GiMethod::None;
-      uint32_t aaPreset          = 0;
-
       bool     hideFocus         = false;
       float    cameraFov         = 67.5f;
       int      fpsLimit          = 0;

common/graphics/renderer.cpp

@@ -87,7 +87,7 @@ Renderer::Renderer() {
 
   Gothic::inst().togglePathtrace.bind(this, &Renderer::togglePathtrace);
 
-  settings.giMethod         = Gothic::options().doGi;
+  settings.giMethod         = Shaders::options().doGi;
   settings.vsmEnabled       = Shaders::options().doVirtualShadow;
   settings.rtsmEnabled      = Shaders::options().doSoftwareShadow;
   settings.swrEnabled       = Shaders::options().swRenderingPreset>0;
@@ -139,7 +139,7 @@ void Renderer::setupSettings() {
     settings.moonSize = 400;
 
   settings.vidResIndex = Gothic::settingsGetF("INTERNAL","vidResIndex");
-  settings.aaEnabled   = (Gothic::options().aaPreset>0) && (settings.vidResIndex==0);
+  settings.aaEnabled   = (Shaders::options().aaPreset>0) && (settings.vidResIndex==0);
 
   // direct lighting
   if(settings.rtsmEnabled)
@@ -186,8 +186,8 @@ void Renderer::toggleGi() {
   if(!Shaders::options().doRtScene)
     return;
 
-  if(settings.giMethod==GiMethod::None && Gothic::options().doGi!=GiMethod::None)
-    settings.giMethod = Gothic::options().doGi;
+  if(settings.giMethod==GiMethod::None && Shaders::options().doGi!=GiMethod::None)
+    settings.giMethod = Shaders::options().doGi;
   else if(settings.giMethod==GiMethod::None && Shaders::isGi1Supported())
     settings.giMethod = GiMethod::Probes; // default for now
   else
@@ -765,7 +765,7 @@ void Renderer::drawTonemapping(Attachment& result, Encoder<CommandBuffer>& cmd,
   }
 
 void Renderer::drawCMAA2(Tempest::Attachment& result, Tempest::Encoder<Tempest::CommandBuffer>& cmd, const WorldView& wview) {
-  auto&          pso             = shaders.cmaa2EdgeColor2x2Presets[Gothic::options().aaPreset];
+  auto&          pso             = shaders.cmaa2EdgeColor2x2Presets[Shaders::options().aaPreset];
   const IVec3    inputGroupSize  = pso.workGroupSize();
   const IVec3    outputGroupSize = inputGroupSize - IVec3(2, 2, 0);
   const uint32_t groupCountX     = uint32_t((sceneLinear.w() + outputGroupSize.x * 2 - 1) / (outputGroupSize.x * 2));

common/graphics/shaders.cpp

@@ -65,6 +65,9 @@ void Shaders::setupOptions() {
   opts.doMeshShading    = gpu.meshlets.meshShader && CommandLine::inst().isMeshShading();
   opts.doSoftwareShadow = Shaders::isRtsmSupported() && CommandLine::inst().isSoftwareShadow();
   opts.doVirtualShadow  = Shaders::isVsmSupported()  && CommandLine::inst().isVirtualShadow();
+  opts.doGi             = opts.doRayQuery ? CommandLine::inst().isRtGi() : GiMethod::None;
+  opts.aaPreset         = CommandLine::inst().aaPreset();
+
   opts.doSoftwareRT     = false;
   }
 

common/graphics/shaders.h

@@ -31,6 +31,8 @@ class Shaders {
       bool     doMeshShading     = false;
       bool     doVirtualShadow   = false;
       bool     doSoftwareShadow  = false;
+      GiMethod doGi              = GiMethod::None;
+      uint32_t aaPreset          = 0;
 
       bool     doSoftwareRT      = false;
       uint32_t swRenderingPreset = 0;