GPU perf optimization: Surface data

See merge request lightspeedrtx/dxvk-remix-nv!921
NVIDIAGameWorks · Aug 2, 2024 · d94d63a · d94d63a
1 parent b6ad250
commit d94d63a
Show file tree

Hide file tree

Showing 19 changed files with 427 additions and 292 deletions.
diff --git a/src/dxvk/rtx_render/rtx_materials.h b/src/dxvk/rtx_render/rtx_materials.h
@@ -107,10 +107,10 @@ struct RtSurface {
     writeGPUHelper(data, offset, packedHash);
 
     writeGPUHelper(data, offset, positionOffset);
-    writeGPUHelper(data, offset, objectPickingValue);
     writeGPUHelper(data, offset, normalOffset);
     writeGPUHelper(data, offset, texcoordOffset);
     writeGPUHelper(data, offset, color0Offset);
+    writeGPUHelper(data, offset, objectPickingValue);
 
     writeGPUHelperExplicit<1>(data, offset, positionStride);
     writeGPUHelperExplicit<1>(data, offset, normalStride);

diff --git a/src/dxvk/shaders/rtx/algorithm/integrator_indirect.slangh b/src/dxvk/shaders/rtx/algorithm/integrator_indirect.slangh
@@ -263,8 +263,9 @@ void integratePathVertex(
   RayInteraction rayInteraction;
   Surface surface;
   SurfaceInteraction surfaceInteraction;
-  surfaceInteraction.position = pathState.origin;
   PolymorphicSurfaceMaterialInteraction polymorphicSurfaceMaterialInteraction;
+
+  surfaceInteraction.position = pathState.origin;
 
   // Todo: Remove hack thing
   HackGenericState hackState;

diff --git a/src/dxvk/shaders/rtx/algorithm/nee_cache_light.slangh b/src/dxvk/shaders/rtx/algorithm/nee_cache_light.slangh
@@ -100,8 +100,7 @@ struct NEECacheUtils
 
   static Surface getSurface(int surfaceIndex)
   {    
-    SURFACE_CREATE_READ(surface0, surfaceIndex, surfaces);
-    Surface surface = surface0;
+    Surface surface = surfaces[uint(surfaceIndex)]; 
   #if USE_SIMIPLIFIED_MODEL
     // Don't override following settings because they may affect some emissive objects
     // surface.isEmissive = false;
@@ -296,8 +295,7 @@ struct NEECacheUtils
 
   static void calculateTriangleLightIntensity(int surfaceIndex, int primitiveIndex, out vec3 triangleCenter, out f16vec3 triangleNormal, out vec3 lightIntensity)
   {
-    SURFACE_CREATE_READ(surface0, surfaceIndex, surfaces);    
-    Surface surface = surface0;
+    const Surface surface = surfaces[uint(surfaceIndex)]; 
     RayInteraction rayInteracton = {};
     rayInteracton.frontHit = true;
     rayInteracton.barycentricCoordinates = barycentricsToUint(uvToBarycentrics(vec2(1.0 / 3.0)));

diff --git a/src/dxvk/shaders/rtx/algorithm/resolve.slangh b/src/dxvk/shaders/rtx/algorithm/resolve.slangh
@@ -25,7 +25,6 @@
 #include "rtx/algorithm/resolve.h"
 #include "rtx/utility/common.slangh"
 #include "rtx/utility/math.slangh"
-#include "rtx/utility/buffer_helpers.slangh"
 #include "rtx/utility/packing.slangh"
 #include "rtx/utility/froxel.slangh"
 #include "rtx/concept/ray/ray.slangh"
@@ -354,9 +353,8 @@ void resolveVertex(
 
   // Create a Surface and Surface Interaction from the hit
 
-  SURFACE_CREATE_READ(tempSurface, rayInteraction.surfaceIndex, surfaces);
+  surface = surfaces[uint(rayInteraction.surfaceIndex)]; 
 
-  surface = tempSurface;
   surfaceInteraction = surfaceInteractionCreate(surface, rayInteraction, ray);
 
   // Process user clip planes and view distance
@@ -942,7 +940,7 @@ void resolveVertexUnordered(
       surfaceInteraction.vertexColor = vertexColor;
     }
 
-    SURFACE_CREATE_READ(surface, rayInteraction.surfaceIndex, surfaces);
+    const Surface surface = surfaces[uint(rayInteraction.surfaceIndex)]; 
 
     if (isTriangle)
       surfaceInteraction = surfaceInteractionCreate(surface, rayInteraction, ray);

diff --git a/src/dxvk/shaders/rtx/algorithm/visibility.slangh b/src/dxvk/shaders/rtx/algorithm/visibility.slangh
@@ -55,7 +55,7 @@ f16vec3 handleVisibilityVertex(Ray ray, RayHitInfo rayHitInfo, uint8_t visibilit
       return 1.0;
   }
 
-  SURFACE_CREATE_READ(surface, surfaceIndex, surfaces);
+  const Surface surface = surfaces[uint(surfaceIndex)]; 
 
   if (surfaceIsDecal(surface))
     // Decals do not cast shadows
@@ -189,12 +189,12 @@ float16_t getRayPortalTransparency(
       // Also note that this does not set up texture gradients properly so this will always likely sample from the lowest mip level
       // which is also probably not great for performance.
 
-      Surface surface;
+      Surface surface = (Surface)0;
       surface.spriteSheetRows = portal.spriteSheetRows;
       surface.spriteSheetCols = portal.spriteSheetCols;
       surface.spriteSheetFPS = portal.spriteSheetFPS;
 
-      SurfaceInteraction surfaceInteraction;
+      SurfaceInteraction surfaceInteraction = (SurfaceInteraction)0;
       surfaceInteraction.textureCoordinates = uv * 0.5f + 0.5f;
       surfaceInteraction.textureGradientX = vec2(0.0f);
       surfaceInteraction.textureGradientY = vec2(0.0f);