Share struct headers between GLSL and C++

Should be nicer to not keep two definitions in sync
sndels · Nov 15, 2024 · 5d6200f · 5d6200f
1 parent d07770c
commit 5d6200f
Show file tree

Hide file tree

Showing 92 changed files with 798 additions and 643 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,6 +29,7 @@ endif() # PROSPER_ALLOCATOR_DEBUG
 # Set up sub-builds and sources
 add_subdirectory(ext)
 add_subdirectory(src)
+add_subdirectory(res)
 
 if(PROSPER_ALWAYS_O2_DEPENDENCIES)
     # Only optimize the dependencies that have a noticeable impact
@@ -113,6 +114,7 @@ target_link_libraries(prosper
     meshoptimizer
     mikktspace
     shaderc
+    shared_shader_structs
     spirv_headers
     stb
     tomlcpp

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Have this here instead of subdirectories to make wildcard clang-format simpler before the
+# llvm version is new enough for .clang-format-ignores
+set(SHARED_SHADER_STRUCTS_INCLUDES
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/dof/dilate.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/dof/gather.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/dof/reduce.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/dof/setup.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/restir_di/initial_reservoirs.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/restir_di/spatial_reuse.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/restir_di/trace.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/deferred_shading.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/draw_list_culler.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/draw_list_generator.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/forward.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/gbuffer.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/hiz_downsampler.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/light_clustering.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/prefilter_radiance.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/rt_reference.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/taa_resolve.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/texture_debug.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/texture_readback.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/push_constants/tone_map.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/scene/camera.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/scene/draw_instance.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/scene/fwd.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/scene/geometry_metadata.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/scene/lights.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/scene/material_data.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/scene/model_instance_transforms.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/fields.h
+    ${CMAKE_CURRENT_LIST_DIR}/shader/shared/shader_structs/fwd.hpp
+    PARENT_SCOPE
+)
+
+add_library(shared_shader_structs INTERFACE ${SHARED_SHADER_STRUCTS_INCLUDES})
+target_include_directories(shared_shader_structs SYSTEM INTERFACE ${CMAKE_CURRENT_LIST_DIR}/shader/shared)
+target_link_libraries(shared_shader_structs INTERFACE glm wheels)
diff --git a/res/shader/deferred_shading.comp b/res/shader/deferred_shading.comp
@@ -9,6 +9,7 @@
 #include "scene/lighting.glsl"
 #include "scene/lights.glsl"
 #include "scene/skybox.glsl"
+#include "shared/shader_structs/push_constants/deferred_shading.h"
 
 layout(set = STORAGE_SET, binding = 0) uniform readonly image2D
     inAlbedoRoughness;
@@ -18,12 +19,7 @@ layout(set = STORAGE_SET, binding = 2) uniform texture2D inNonLinearDepth;
 layout(set = STORAGE_SET, binding = 3) uniform image2D outColor;
 layout(set = STORAGE_SET, binding = 4) uniform sampler depthSampler;
 
-layout(push_constant) uniform DeferredShadingPC
-{
-    uint DrawType;
-    uint ibl;
-}
-PC;
+layout(push_constant) uniform PushConstants { DeferredShadingPC PC; };
 
 layout(local_size_x = GROUP_X, local_size_y = GROUP_Y) in;
 void main()
@@ -63,15 +59,15 @@ void main()
     if (PC.ibl == 1)
         color += evalIBL(surface);
 
-    if (PC.DrawType != DrawType_Default)
+    if (PC.drawType != DrawType_Default)
     {
-        if (PC.DrawType == DrawType_Position)
+        if (PC.drawType == DrawType_Position)
         {
             DebugInputs di;
             di.position = surface.positionWS;
             imageStore(
                 outColor, coord,
-                vec4(commonDebugDraw(PC.DrawType, di, surface.material), 1));
+                vec4(commonDebugDraw(PC.drawType, di, surface.material), 1));
         }
         else
         {

diff --git a/res/shader/dof/dilate.comp b/res/shader/dof/dilate.comp
@@ -5,17 +5,13 @@
 // Based on A Life of a Bokeh by Guillaume Abadie
 // https://advances.realtimerendering.com/s2018/index.htm
 
+#include "../shared/shader_structs/push_constants/dof/dilate.h"
+
 layout(set = 0, binding = 0) uniform texture2D inTileMinMaxCoC;
 layout(set = 0, binding = 1) uniform writeonly image2D outDilatedTileMinMaxCoC;
 layout(set = 0, binding = 2) uniform sampler nearestSampler;
 
-layout(push_constant) uniform DilatePC
-{
-    ivec2 res;
-    vec2 invRes;
-    int gatherRadius;
-}
-PC;
+layout(push_constant) uniform PushConstants { DilatePC PC; };
 
 layout(local_size_x = GROUP_X, local_size_y = GROUP_Y) in;
 void main()

diff --git a/res/shader/dof/gather.comp b/res/shader/dof/gather.comp
@@ -4,6 +4,7 @@
 
 #include "../common/math.glsl"
 #include "../common/random.glsl"
+#include "../shared/shader_structs/push_constants/dof/gather.h"
 
 // Based on A Life of a Bokeh by Guillaume Abadie
 // https://advances.realtimerendering.com/s2018/index.htm
@@ -16,13 +17,7 @@ layout(set = 0, binding = 3) uniform writeonly image2D
 layout(set = 0, binding = 4) uniform sampler nearestSampler;
 layout(set = 0, binding = 5) uniform sampler trilinearSampler;
 
-layout(push_constant) uniform GatherPC
-{
-    ivec2 halfResolution;
-    vec2 invHalfResolution;
-    uint frameIndex;
-}
-PC;
+layout(push_constant) uniform PushConstants { GatherPC PC; };
 
 int octawebRingSampleCount(int ring)
 {

diff --git a/res/shader/dof/reduce.comp b/res/shader/dof/reduce.comp
@@ -6,6 +6,8 @@
 // https://advances.realtimerendering.com/s2018/index.htm
 // implemented using https://github.com/GPUOpen-Effects/FidelityFX-SPD
 
+#include "../shared/shader_structs/push_constants/dof/reduce.h"
+
 layout(set = 0, binding = 0) uniform image2D imgSrc;
 layout(set = 0, binding = 1) uniform coherent image2D imgDst[12];
 layout(std430, set = 0, binding = 2) coherent buffer SpdGlobalAtomicBuffer
@@ -14,13 +16,7 @@ layout(std430, set = 0, binding = 2) coherent buffer SpdGlobalAtomicBuffer
 }
 spdGlobalAtomic;
 
-layout(push_constant) uniform ReducePC
-{
-    ivec2 topMipResolution;
-    uint numWorkGroupsPerSlice;
-    uint mips;
-}
-PC;
+layout(push_constant) uniform PushConstants { ReducePC PC; };
 
 #define A_GPU 1
 #define A_GLSL 1

diff --git a/res/shader/dof/setup.comp b/res/shader/dof/setup.comp
@@ -7,6 +7,7 @@
 
 #include "../common/math.glsl"
 #include "../scene/camera.glsl"
+#include "../shared/shader_structs/push_constants/dof/setup.h"
 #include "bilateral.glsl"
 
 layout(set = STORAGE_SET, binding = 0) uniform readonly image2D inIllumination;
@@ -18,13 +19,7 @@ layout(set = STORAGE_SET, binding = 2) uniform image2D outIllumination;
 layout(set = STORAGE_SET, binding = 3) uniform image2D outCircleOfConfusion;
 layout(set = STORAGE_SET, binding = 4) uniform sampler depthSampler;
 
-layout(push_constant) uniform SetupPC
-{
-    float focusDistance;
-    float maxBackgroundCoC;
-    float maxCoC;
-}
-PC;
+layout(push_constant) uniform PushConstants { SetupPC PC; };
 
 float circleOfConfusion(float viewDepth)
 {

diff --git a/res/shader/draw_list_culler.comp b/res/shader/draw_list_culler.comp
@@ -10,6 +10,7 @@
 #include "scene/camera.glsl"
 #include "scene/geometry.glsl"
 #include "scene/instances.glsl"
+#include "shared/shader_structs/push_constants/draw_list_culler.h"
 
 // TODO: Put in a header?
 struct DrawMeshletInstance
@@ -51,19 +52,12 @@ layout(set = STORAGE_SET, binding = 4) uniform texture2D
 // This should clamp to 1 on/beyond edges
 layout(set = STORAGE_SET, binding = 5) uniform sampler depthSampler;
 
-layout(push_constant) uniform DrawListCullerPC
-{
-    uvec2 hizResolution;
-    vec2 hizUvScale;
-    // 0 means no hiz bound
-    uint hizMipCount;
-    uint outputSecondPhaseInput;
-}
-PC;
+layout(push_constant) uniform PushConstants { DrawListCullerPC PC; };
 
 float signedDistance(vec4 plane, vec3 p) { return dot(plane, vec4(p, 1)); }
 
-void transformBounds(inout MeshletBounds bounds, Transforms trfn, float scale)
+void transformBounds(
+    inout MeshletBounds bounds, ModelInstanceTransforms trfn, float scale)
 {
     // Need full SRT for center as it's the cluster center in model space
     bounds.center = (vec4(bounds.center, 1.0) * trfn.modelToWorld).xyz;
@@ -219,7 +213,7 @@ void main()
     MeshletInfo meshletInfo =
         loadMeshletInfo(metadata, meshletInstance.meshletIndex);
 
-    Transforms trfn =
+    ModelInstanceTransforms trfn =
         modelInstanceTransforms.instance[instance.modelInstanceIndex];
 
     float scale = modelInstanceScales.instance[instance.modelInstanceIndex];

diff --git a/res/shader/draw_list_generator.comp b/res/shader/draw_list_generator.comp
@@ -10,6 +10,7 @@
 #include "scene/geometry.glsl"
 #include "scene/instances.glsl"
 #include "scene/materials.glsl"
+#include "shared/shader_structs/push_constants/draw_list_generator.h"
 
 // TODO: Put in a header?
 struct DrawMeshletInstance
@@ -24,8 +25,7 @@ layout(std430, set = STORAGE_SET, binding = 0) writeonly buffer DrawList
 }
 outDrawList;
 
-layout(push_constant) uniform DrawListGeneratorPC { uint matchTransparents; }
-PC;
+layout(push_constant) uniform PushConstants { DrawListGeneratorPC PC; };
 
 layout(local_size_x = GROUP_X) in;
 void main()

diff --git a/res/shader/forward.frag b/res/shader/forward.frag
@@ -7,14 +7,16 @@
 #include "brdf.glsl"
 #include "common/random.glsl"
 #include "debug.glsl"
-#include "forward_pc.glsl"
 #include "scene/camera.glsl"
 #include "scene/instances.glsl"
 #include "scene/light_clusters.glsl"
 #include "scene/lighting.glsl"
 #include "scene/lights.glsl"
 #include "scene/materials.glsl"
 #include "scene/skybox.glsl"
+#include "shared/shader_structs/push_constants/forward.h"
+
+layout(push_constant) uniform PushConstants { ForwardPC PC; };
 
 layout(location = 0) in vec3 inPositionWorld;
 layout(location = 1) in float inZCam;
@@ -90,9 +92,9 @@ void main()
     // Write before debug to not break TAA
     outVelocity = clamp(velocity, vec2(-1), vec2(1));
 
-    if (PC.DrawType >= DrawType_PrimitiveID)
+    if (PC.drawType >= DrawType_PrimitiveID)
     {
-        if (PC.DrawType == DrawType_MeshletID)
+        if (PC.drawType == DrawType_MeshletID)
         {
             outColor = vec4(uintToColor(inMeshletIndex), 1);
             return;
@@ -105,7 +107,7 @@ void main()
         di.position = surface.positionWS;
         di.shadingNormal = surface.normalWS;
         di.texCoord0 = inTexCoord0;
-        outColor = vec4(commonDebugDraw(PC.DrawType, di, surface.material), 1);
+        outColor = vec4(commonDebugDraw(PC.drawType, di, surface.material), 1);
         return;
     }
 

diff --git a/res/shader/forward.mesh b/res/shader/forward.mesh
@@ -7,9 +7,11 @@
 #extension GL_EXT_shader_8bit_storage : require
 
 #ifdef USE_GBUFFER_PC
-#include "gbuffer_pc.glsl"
+#include "shared/shader_structs/push_constants/gbuffer.h"
+layout(push_constant) uniform PushConstants { GBufferPC PC; };
 #else // !USE_GBUFFER_PC
-#include "forward_pc.glsl"
+#include "shared/shader_structs/push_constants/forward.h"
+layout(push_constant) uniform PushConstants { ForwardPC PC; };
 #endif // USE_GBUFFER_PC
 
 #include "common/math.glsl"
@@ -60,8 +62,8 @@ layout(location = 8) out flat uint outMeshletIndex[];
 
 void writeTransformedVertex(
     DrawInstance instance, MeshletInstance meshletInstance,
-    GeometryMetadata metadata, Transforms trfn, uint globalVertexIndex,
-    uint meshletVertexIndex)
+    GeometryMetadata metadata, ModelInstanceTransforms trfn,
+    uint globalVertexIndex, uint meshletVertexIndex)
 {
     Vertex vertexModel = loadVertex(metadata, globalVertexIndex);
     Vertex vertexWorld = transform(vertexModel, trfn);
@@ -75,7 +77,7 @@ void writeTransformedVertex(
     vec4 posNDC = camera.cameraToClip * posCam;
     outPositionNDC[meshletVertexIndex] = posNDC;
 
-    Transforms prevTrfn = trfn;
+    ModelInstanceTransforms prevTrfn = trfn;
     if (PC.previousTransformValid == 1)
         prevTrfn = previousModelInstanceTransforms
                        .instance[instance.modelInstanceIndex];
@@ -106,7 +108,7 @@ void main()
     GeometryMetadata metadata = geometryMetadatas.data[instance.meshIndex];
     MeshletInfo meshletInfo =
         loadMeshletInfo(metadata, meshletInstance.meshletIndex);
-    Transforms trfn =
+    ModelInstanceTransforms trfn =
         modelInstanceTransforms.instance[instance.modelInstanceIndex];
 
     if (threadIndex == 0)

diff --git a/res/shader/forward_pc.glsl b/res/shader/forward_pc.glsl
diff --git a/res/shader/gbuffer.frag b/res/shader/gbuffer.frag
@@ -5,10 +5,12 @@
 
 #include "common/math.glsl"
 #include "debug.glsl"
-#include "gbuffer_pc.glsl"
 #include "scene/camera.glsl"
 #include "scene/instances.glsl"
 #include "scene/materials.glsl"
+#include "shared/shader_structs/push_constants/gbuffer.h"
+
+layout(push_constant) uniform PushConstants { GBufferPC PC; };
 
 layout(location = 0) in vec3 inPositionWorld;
 layout(location = 1) in float inZCam;

diff --git a/res/shader/gbuffer_pc.glsl b/res/shader/gbuffer_pc.glsl
diff --git a/res/shader/hiz_downsampler.comp b/res/shader/hiz_downsampler.comp
@@ -6,6 +6,8 @@
 // https://advances.realtimerendering.com/s2018/index.htm
 // implemented using https://github.com/GPUOpen-Effects/FidelityFX-SPD
 
+#include "shared/shader_structs/push_constants/hiz_downsampler.h"
+
 layout(set = 0, binding = 0) uniform texture2D depthSrc;
 layout(set = 0, binding = 1) uniform sampler depthSampler;
 layout(set = 0, binding = 2) uniform coherent image2D depthDst[12];
@@ -15,14 +17,7 @@ layout(std430, set = 0, binding = 3) coherent buffer SpdGlobalAtomicBuffer
 }
 spdGlobalAtomic;
 
-layout(push_constant) uniform ReducePC
-{
-    ivec2 inputResolution;
-    ivec2 topMipResolution;
-    uint numWorkGroupsPerSlice;
-    uint mips;
-}
-PC;
+layout(push_constant) uniform PushConstants { HizDownsamplerPC PC; };
 
 #define A_GPU 1
 #define A_GLSL 1