Merge branch 'pkristof/codeCleanup' into 'main'

Cleaned up code and shader code formatting

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

src/dxvk/dxvk_adapter.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
+* Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -302,6 +302,10 @@ namespace dxvk {
                 || !required.vulkan11Features.shaderDrawParameters)
         && (m_deviceFeatures.vulkan12Features.hostQueryReset
                 || !required.vulkan12Features.hostQueryReset)
+        && (m_deviceFeatures.vulkan12Features.scalarBlockLayout
+                || !required.vulkan12Features.scalarBlockLayout)
+        && (m_deviceFeatures.vulkan12Features.uniformBufferStandardLayout
+                || !required.vulkan12Features.uniformBufferStandardLayout)
         && (m_deviceFeatures.ext4444Formats.formatA4R4G4B4
                 || !required.ext4444Formats.formatA4R4G4B4)
         && (m_deviceFeatures.ext4444Formats.formatA4B4G4R4
@@ -490,7 +494,9 @@ namespace dxvk {
     enabledFeatures.khrAccelerationStructureFeatures.accelerationStructure = m_deviceFeatures.khrAccelerationStructureFeatures.accelerationStructure;
     enabledFeatures.khrRayQueryFeatures.rayQuery = m_deviceFeatures.khrRayQueryFeatures.rayQuery;
     enabledFeatures.khrDeviceRayTracingPipelineFeatures.rayTracingPipeline = m_deviceFeatures.khrDeviceRayTracingPipelineFeatures.rayTracingPipeline;
-
+    enabledFeatures.vulkan12Features.scalarBlockLayout = m_deviceFeatures.vulkan12Features.scalarBlockLayout;
+    enabledFeatures.vulkan12Features.uniformBufferStandardLayout = m_deviceFeatures.vulkan12Features.uniformBufferStandardLayout;
+
     enabledFeatures.vulkan12Features.shaderInt8 = VK_TRUE;
     enabledFeatures.vulkan12Features.storageBuffer8BitAccess = VK_TRUE;
     enabledFeatures.vulkan12Features.uniformAndStorageBuffer8BitAccess = VK_TRUE;
@@ -1200,6 +1206,10 @@ namespace dxvk {
       "\n  shaderInt64                            : ", features.core.features.shaderInt64 ? "1" : "0",
       "\n  variableMultisampleRate                : ", features.core.features.variableMultisampleRate ? "1" : "0",
       "\n  hostQueryReset                         : ", features.vulkan12Features.hostQueryReset ? "1" : "0",
+      // NV-DXVK
+      "\n  scalarBlockLayout                      : ", features.vulkan12Features.scalarBlockLayout ? "1" : "0",
+      "\n  uniformBufferStandardLayout            : ", features.vulkan12Features.uniformBufferStandardLayout ? "1" : "0",
+      // NV-DXVK end
       "\n", VK_EXT_4444_FORMATS_EXTENSION_NAME,
       "\n  formatA4R4G4B4                         : ", features.ext4444Formats.formatA4R4G4B4 ? "1" : "0",
       "\n  formatA4B4G4R4                         : ", features.ext4444Formats.formatA4B4G4R4 ? "1" : "0",

src/dxvk/dxvk_buffer.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
+* Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -340,6 +340,13 @@ namespace dxvk {
     Rc<DxvkBuffer> clone();
     // NV-DXVK end
 
+
+    // NV-DXVK start: get access to VkDeviceMemory
+    const DxvkBufferHandle& getBufferHandle() { 
+      return m_buffer;
+    }
+    // NV-DXVK end
+
   protected:
     DxvkDevice*             m_device;
     DxvkBufferCreateInfo    m_info;

src/dxvk/imgui/dxvk_imgui.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
+* Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -297,8 +297,8 @@ namespace dxvk {
       {UpscalerType::TAAU, "TAA-U"},
   } });
 
-  ImGui::ComboWithKey<RussianRouletteMode> secondPlusRussianRouletteModeCombo {
-    "2nd+ Russian Roulette Mode",
+  ImGui::ComboWithKey<RussianRouletteMode> secondPlusBounceRussianRouletteModeCombo {
+    "2nd+ Bounce Russian Roulette Mode",
     ImGui::ComboWithKey<RussianRouletteMode>::ComboEntries { {
         {RussianRouletteMode::ThroughputBased, "Throughput Based"},
         {RussianRouletteMode::SpecularBased, "Specular Based"}
@@ -2637,7 +2637,7 @@ namespace dxvk {
           ImGui::DragFloat("1st bounce: Min Continue Probability", &RtxOptions::Get()->russianRoulette1stBounceMinContinueProbabilityObject(), 0.01f, 0.0f, 1.0f, "%.3f", sliderFlags);
           ImGui::DragFloat("1st bounce: Max Continue Probability", &RtxOptions::Get()->russianRoulette1stBounceMaxContinueProbabilityObject(), 0.01f, 0.0f, 1.0f, "%.3f", sliderFlags);
 
-          secondPlusRussianRouletteModeCombo.getKey(&RtxOptions::Get()->russianRouletteModeObject());
+          secondPlusBounceRussianRouletteModeCombo.getKey(&RtxOptions::Get()->russianRouletteModeObject());
           if (RtxOptions::Get()->russianRouletteMode() == RussianRouletteMode::ThroughputBased)
           {
             ImGui::DragFloat("2nd+ bounce: Max Continue Probability", &RtxOptions::Get()->russianRouletteMaxContinueProbabilityObject(), 0.01f, 0.0f, 1.0f, "%.3f", sliderFlags);

src/dxvk/rtx_render/rtx_context.cpp

@@ -446,7 +446,7 @@ namespace dxvk {
 
     const bool isRaytracingEnabled = RtxOptions::Get()->enableRaytracing();
 
-    if(isRaytracingEnabled && isCameraValid) {
+    if (isRaytracingEnabled && isCameraValid) {
       if (targetImage == nullptr) {
         targetImage = m_state.om.renderTargets.color[0].view->image();  
       }
@@ -455,7 +455,7 @@ namespace dxvk {
       const bool captureScreenImage = s_triggerScreenshot || (captureTestScreenshot && !s_capturePrePresentTestScreenshot);
       const bool captureDebugImage = RtxOptions::Get()->shouldCaptureDebugImage();
 
-      if(s_triggerUsdCapture) {
+      if (s_triggerUsdCapture) {
         s_triggerUsdCapture = false;
         m_common->capturer()->triggerNewCapture();
       }
@@ -522,6 +522,7 @@ namespace dxvk {
         // Path Tracing
         dispatchPathTracing(rtOutput);
 
+        // RTXDI confidence
         m_common->metaRtxdiRayQuery().dispatchConfidence(this, rtOutput);
 
         // ReSTIR GI
@@ -1338,8 +1339,9 @@ namespace dxvk {
       denoiseInput.frameTimeMs = frameTimeMilliseconds;
       denoiseInput.reset = m_resetHistory;
 
-      if(RtxOptions::Get()->useRTXDI() && m_common->metaRtxdiRayQuery().getEnableDenoiserConfidence())
+      if (RtxOptions::Get()->useRTXDI() && m_common->metaRtxdiRayQuery().getEnableDenoiserConfidence()) {
         denoiseInput.confidence = &rtOutput.getCurrentRtxdiConfidence().resource(Resources::AccessType::Read);
+      }
 
       DxvkDenoise::Output denoiseOutput;
       denoiseOutput.diffuse_hitT = &rtOutput.m_primaryDirectDiffuseRadiance.resource(Resources::AccessType::Write);
@@ -1479,7 +1481,7 @@ namespace dxvk {
     // The tone curve shouldn't be too different between raytracing modes, 
     // but the reset of denoised buffers causes wide tone curve differences
     // until it converges and thus making comparison of raytracing mode outputs more difficult    
-    if(RtxOptions::Get()->tonemappingMode() == TonemappingMode::Global) {
+    if (RtxOptions::Get()->tonemappingMode() == TonemappingMode::Global) {
       DxvkToneMapping& toneMapper = m_common->metaToneMapping();
       toneMapper.dispatch(this, 
         getResourceManager().getSampler(VK_FILTER_LINEAR, VK_SAMPLER_MIPMAP_MODE_NEAREST, VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER),

src/dxvk/rtx_render/rtx_debug_view.cpp

@@ -244,13 +244,13 @@ namespace dxvk {
         {DEBUG_VIEW_NOISY_DEMODULATED_SECONDARY_COMBINED_SPECULAR_RADIANCE,"Secondary Combined Specular: Demodulated Noisy Color"},
         {DEBUG_VIEW_DENOISED_SECONDARY_COMBINED_SPECULAR_RADIANCE,         "Secondary Combined Specular: Denoised Color"},
 
-        { DEBUG_VIEW_NOISY_PRIMARY_DIRECT_RADIANCE,                        "Primary Direct: Noisy Color" },
-        { DEBUG_VIEW_NOISY_PRIMARY_INDIRECT_RADIANCE,                      "Primary Indirect: Noisy Color" },
-        { DEBUG_VIEW_NOISY_PRIMARY_RADIANCE,                               "Primary: Noisy Color" },
-        { DEBUG_VIEW_NOISY_SECONDARY_DIRECT_RADIANCE,                      "Secondary Direct: Noisy Color" },
-        { DEBUG_VIEW_NOISY_SECONDARY_INDIRECT_RADIANCE,                    "Secondary Indirect: Noisy Color" },
-        { DEBUG_VIEW_NOISY_SECONDARY_RADIANCE,                             "Secondary: Noisy Color" },
-        { DEBUG_VIEW_NOISY_RADIANCE,                                       "Primary + Secondary: Noisy Color" },
+        {DEBUG_VIEW_NOISY_PRIMARY_DIRECT_RADIANCE,                         "Primary Direct: Noisy Color" },
+        {DEBUG_VIEW_NOISY_PRIMARY_INDIRECT_RADIANCE,                       "Primary Indirect: Noisy Color" },
+        {DEBUG_VIEW_NOISY_PRIMARY_RADIANCE,                                "Primary: Noisy Color" },
+        {DEBUG_VIEW_NOISY_SECONDARY_DIRECT_RADIANCE,                       "Secondary Direct: Noisy Color" },
+        {DEBUG_VIEW_NOISY_SECONDARY_INDIRECT_RADIANCE,                     "Secondary Indirect: Noisy Color" },
+        {DEBUG_VIEW_NOISY_SECONDARY_RADIANCE,                              "Secondary: Noisy Color" },
+        {DEBUG_VIEW_NOISY_RADIANCE,                                        "Primary + Secondary: Noisy Color" },
 
         {DEBUG_VIEW_INSTRUMENTATION_THREAD_DIVERGENCE,                     "Thread Divergence(Debug Knob.x)"},
         {DEBUG_VIEW_NAN,                                                   "Inf/NaN Check"},
@@ -488,7 +488,7 @@ namespace dxvk {
     }
   }
 
-  void DebugView::processOutputStatistics(Rc<DxvkContext>& ctx) {
+  void DebugView::processOutputStatistics(Rc<RtxContext>& ctx) {
 
     if (m_showOutputStatistics) {
       const uint32_t frameIdx = ctx->getDevice()->getCurrentFrameId();
@@ -853,8 +853,6 @@ namespace dxvk {
         ctx->clearColorImage(m_instrumentation.image, clearColor, subRange);
       }
     }
-
-    processOutputStatistics(ctx);
   }
 
   DebugViewArgs DebugView::getCommonDebugViewArgs(
@@ -998,6 +996,9 @@ namespace dxvk {
     const Resources::RaytracingOutput& rtOutput) {
     ScopedGpuProfileZone(ctx, "Debug View");
 
+    // Process output statistics now before we schedule a debug view dispatch that updates them
+    processOutputStatistics(ctx);
+
     // Inputs 
 
     ctx->bindResourceView(DEBUG_VIEW_BINDING_DENOISED_PRIMARY_DIRECT_DIFFUSE_RADIANCE_HIT_T_INPUT, rtOutput.m_primaryDirectDiffuseRadiance.view(Resources::AccessType::Read), nullptr);

src/dxvk/rtx_render/rtx_debug_view.h

@@ -85,7 +85,7 @@ namespace dxvk {
     virtual void onFrameBegin(Rc<DxvkContext>& ctx, const VkExtent3D& downscaledExtent, const VkExtent3D& targetExtent) override;
 
   private:
-    void processOutputStatistics(Rc<DxvkContext>& ctx);
+    void processOutputStatistics(Rc<RtxContext>& ctx);
     void showOutputStatistics();
     bool shouldDebugViewDispatch() const;
     void createConstantsBuffer();

src/dxvk/rtx_render/rtx_options.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
+* Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -1434,9 +1434,9 @@ namespace dxvk {
     //   General
     bool getCaptureShowMenuOnHotkey() const { return m_captureShowMenuOnHotkey.getValue(); }
     bool getCaptureInstances() const {
-      if(m_captureNoInstance.getValue() != m_captureNoInstance.getDefaultValue()) {
+      if (m_captureNoInstance.getValue() != m_captureNoInstance.getDefaultValue()) {
         Logger::warn("rtx.captureNoInstance has been deprecated, but will still be respected for the time being, unless rtx.captureInstances is set.");
-        if(m_captureInstances.getValue() != m_captureInstances.getDefaultValue()) {
+        if (m_captureInstances.getValue() != m_captureInstances.getDefaultValue()) {
           return m_captureInstances;
         }
         return !m_captureNoInstance;

src/dxvk/rtx_render/rtx_pathtracer_gbuffer.cpp

@@ -173,7 +173,9 @@ namespace dxvk {
     }
   }
 
-  void DxvkPathtracerGbuffer::dispatch(RtxContext* ctx, const Resources::RaytracingOutput& rtOutput) {
+  void DxvkPathtracerGbuffer::dispatch(
+    RtxContext* ctx, 
+    const Resources::RaytracingOutput& rtOutput) {
     ScopedGpuProfileZone(ctx, "Gbuffer Raytracing");
 
     // Bind resources
@@ -348,11 +350,12 @@ namespace dxvk {
     }
   }
 
-  DxvkRaytracingPipelineShaders DxvkPathtracerGbuffer::getPipelineShaders(const bool isPSRPass,
-                                                                          const bool useRayQuery,
-                                                                          const bool serEnabled, 
-                                                                          const bool ommEnabled, 
-                                                                          const bool includePortals) {
+  DxvkRaytracingPipelineShaders DxvkPathtracerGbuffer::getPipelineShaders(
+    const bool isPSRPass,
+    const bool useRayQuery,
+    const bool serEnabled, 
+    const bool ommEnabled, 
+    const bool includePortals) {
     ScopedCpuProfileZone();
     DxvkRaytracingPipelineShaders shaders;
     if (useRayQuery) {

src/dxvk/rtx_render/rtx_pathtracer_integrate_direct.cpp

@@ -102,8 +102,9 @@ namespace dxvk {
 
     const bool isOpacityMicromapSupported = OpacityMicromapManager::checkIsOpacityMicromapSupported(*m_device);
 
-    for (int32_t ommEnabled = isOpacityMicromapSupported; ommEnabled > 0; ommEnabled--)
+    for (int32_t ommEnabled = isOpacityMicromapSupported; ommEnabled > 0; ommEnabled--) {
       pipelineManager.registerRaytracingShaders(getPipelineShaders(true, ommEnabled));
+    }
 
     DxvkComputePipelineShaders shaders;
     shaders.cs = getComputeShader();

src/dxvk/rtx_render/rtx_pathtracer_integrate_indirect.cpp

@@ -411,12 +411,13 @@ namespace dxvk {
     }
   }
 
-  DxvkRaytracingPipelineShaders DxvkPathtracerIntegrateIndirect::getPipelineShaders(const bool useRayQuery,
-                                                                                    const bool serEnabled,
-                                                                                    const bool ommEnabled,
-                                                                                    const bool useNeeCache,
-                                                                                    const bool includePortals,
-                                                                                    const bool pomEnabled) {
+  DxvkRaytracingPipelineShaders DxvkPathtracerIntegrateIndirect::getPipelineShaders(
+    const bool useRayQuery,
+    const bool serEnabled,
+    const bool ommEnabled,
+    const bool useNeeCache,
+    const bool includePortals,
+    const bool pomEnabled) {
 
     DxvkRaytracingPipelineShaders shaders;
     if (useRayQuery) {

src/dxvk/shaders/rtx/README.md

@@ -144,10 +144,13 @@ void main(uvec2 threadID : SV_DispatchThreadID)
 - Delimiter commas (function calls or parameter lists) or semicolons (in for loops) should be followed by a space (or a new line if needed to split across lines).
 - Lines should be kept at a reasonable length (100-120 ish characters max typically). Excessively long lines should be split up with newlines.
 - Splitting across lines should be done ideally at delimiters or other logical points, for example after each item in a function call, after a bitwise or boolean and/or in a chain of expressions, or even at "important" binary math operators.
-
+- An empty space should be between if/for/while/switch and (.
+- Header files should be guarded with #pragma once.
 A combined example of these stylistic choices in use is as follows:
 
 ```glsl
+#pragma once
+
 struct Foo
 {
   uint fooBarBaz;
@@ -169,33 +172,37 @@ vec3 exampleHelper(Foo foo, bool test, inout bool specialFlag)
 
   // Do some calculations conditionally
 
-  if (foo.anotherFoo > someConstant)
+  int loopCounter = 2;
+  while (loopCounter-- > 0)
   {
-    switch (foo.anotherFoo)
+    if (foo.anotherFoo > someConstant)
     {
-    // Note: Fallthrough to Apple type.
-    default:
-    case anotherFooTypeApple:
-      someExcessivelyLongFunctionNameForDemonstrationPurposes(
-        foo.anotherBaz + 1.0h,
-        foo.anotherBaz / 2.0h,
-        foo.anotherBaz * 5.0h);
-
-      break;
-    case anotherFooTypeOrange:
-      if (
-        (foo.fooBarBaz == 26 && foo.anotherBaz == 2.0h) ||
-        foo.fooBarBaz == 5
-      )
+      switch (foo.anotherFoo)
       {
-        const uint someScalar = uint(foo.anotherFoo) * foo.fooBarBaz;
-
-        specialFlag = true;
-
-        return vec3(float(someScalar));
+      // Note: Fallthrough to Apple type.
+      default:
+      case anotherFooTypeApple:
+        someExcessivelyLongFunctionNameForDemonstrationPurposes(
+          foo.anotherBaz + 1.0h,
+          foo.anotherBaz / 2.0h,
+          foo.anotherBaz * 5.0h);
+
+        break;
+      case anotherFooTypeOrange:
+        if (
+          (foo.fooBarBaz == 26 && foo.anotherBaz == 2.0h) ||
+          foo.fooBarBaz == 5
+        )
+        {
+          const uint someScalar = uint(foo.anotherFoo) * foo.fooBarBaz;
+
+          specialFlag = true;
+
+          return vec3(float(someScalar));
+        }
+
+        break;
       }
-
-      break;
     }
   }