trying to a add automatic exposure

res/shaders/DepthCullingTask.slang

@@ -105,7 +105,7 @@ void taskMain(
         viewFrustum.sides[3] = computePlane(origin, corners[3], corners[2]);
         meshVisible = true;
 #ifdef DEPTH_CULLING
-        meshVisible = mesh.bounding.insideFrustum(viewFrustum) && isBoxVisible(mesh.bounding);
+        //meshVisible = mesh.bounding.insideFrustum(viewFrustum) && isBoxVisible(mesh.bounding);
 #endif
     }
     GroupMemoryBarrierWithGroupSync();

res/shaders/Exposure.slang

@@ -0,0 +1,78 @@
+
+struct HistogramParameters
+{
+    float minLogLum;
+    float inverseLogLumRange;
+    float timeCoeff;
+    uint numPixels;
+    Texture2D hdrImage;
+    globallycoherent RWStructuredBuffer<uint> histogram;
+    RWStructuredBuffer<float> averageLuminance;
+};
+ParameterBlock<HistogramParameters> pHistogramParams;
+
+static const float3 RGB_TO_LUMINANCE = float3(0.2125, 0.7154, 0.0721);
+static const float eps = 0.005;
+
+uint colorToBin(float3 hdrColor) {
+    float lum = dot(hdrColor, RGB_TO_LUMINANCE);
+
+    if(lum < eps) {
+        return 0;
+    }
+
+    float logLum = clamp((log2(lum) - pHistogramParams.minLogLum) * pHistogramParams.inverseLogLumRange, 0, 1);
+
+    return uint(logLum * 254.0 + 1.0);
+}
+
+groupshared uint histogramShared[256];
+
+[shader("compute")]
+[numthreads(16, 16, 1)]
+void histogram(uint threadID : SV_GroupIndex, uint2 globalThreadID : SV_DispatchThreadID)
+{
+    histogramShared[threadID] = 0;
+    GroupMemoryBarrierWithGroupSync();
+
+    uint2 dim;
+    pHistogramParams.hdrImage.GetDimensions(dim.x, dim.y);
+    if(globalThreadID.x < dim.x && globalThreadID.y < dim.y) {
+        float3 hdrColor = pHistogramParams.hdrImage.Load(int3(globalThreadID, 0)).xyz;
+        uint binIndex = colorToBin(hdrColor);
+
+        InterlockedAdd(histogramShared[binIndex], 1);
+    }
+
+    GroupMemoryBarrierWithGroupSync();
+
+    InterlockedAdd(pHistogramParams.histogram[threadID], histogramShared[threadID]);
+}
+
+[shader("compute")]
+[numthreads(256, 1, 1)]
+void exposure(uint threadID : SV_GroupThreadID)
+{
+    uint countForThisBin = pHistogramParams.histogram[threadID];
+    histogramShared[threadID] = countForThisBin * threadID;
+
+    GroupMemoryBarrierWithGroupSync();
+
+    pHistogramParams.histogram[threadID] = 0;
+
+    for(uint cutoff = (256 >> 1); cutoff > 0; cutoff >>= 1) {
+        if(uint(threadID) < cutoff) {
+            histogramShared[threadID] += histogramShared[threadID + cutoff];
+        }
+        GroupMemoryBarrierWithGroupSync();
+    }
+    if(threadID == 0) {
+        float weightedLogAverage = (histogramShared[0] / max(pHistogramParams.numPixels - float(countForThisBin), 1.0f)) - 1.0f;
+
+        float weightedAvgLum = exp2(((weightedLogAverage / 254.0f) * pHistogramParams.inverseLogLumRange) + pHistogramParams.minLogLum);
+
+        float lumLastFrame = pHistogramParams.averageLuminance[0];
+        float adaptedLum = lumLastFrame + (weightedAvgLum - lumLastFrame) * pHistogramParams.timeCoeff;
+        pHistogramParams.averageLuminance[0] = adaptedLum;
+    }
+}

res/shaders/Placeholder.json

@@ -1,15 +0,0 @@
-{
-	"name": "Placeholder",
-    "params": {
-    },
-	"code": [
-		{
-			"exp": "BRDF",
-			"profile": "BlinnPhong",
-			"values": {
-				"baseColor": "float3(0, 1, 0)",
-				"normal": "float3(0, 0, 1)"
-			}
-		}
-	]
-}

res/shaders/ToneMapping.slang

@@ -31,8 +31,9 @@ struct Parameters
   float sat = 1.0;
   Texture2D hdrInputTexture;
   SamplerState hdrSampler;
+  StructuredBuffer<float> averageLuminance;
 };
-ParameterBlock<Parameters> pParams;
+ParameterBlock<Parameters> pToneMappingParams;
 
 // AgX
 // ->
@@ -88,15 +89,15 @@ float3 agxEotf(float3 val) {
   return val;
 }
 
-float3 agxLook(float3 val) {
+float3 agxLook(float3 val, float avgLum) {
   const float3 lw = float3(0.2126, 0.7152, 0.0722);
-  float luma = dot(val, lw);
+  float luma = dot(val, lw) / (9.6 * avgLum + 0.00001);
   
   // Default
-  float3 offset = pParams.offset.xyz;
+  float3 offset = pToneMappingParams.offset.xyz;
-  float3 slope = pParams.slope.xyz;
+  float3 slope = pToneMappingParams.slope.xyz;
-  float3 power = pParams.power.xyz;
+  float3 power = pToneMappingParams.power.xyz;
-  float sat = pParams.sat;
+  float sat = pToneMappingParams.sat;
  
   // ASC CDL
   val = pow(val * slope + offset, power);
@@ -106,12 +107,12 @@ float3 agxLook(float3 val) {
 [shader("pixel")]
 float4 toneMapping(float2 uv : UV) : SV_Target
 {
-	float3 hdrValue = pParams.hdrInputTexture.Sample(pParams.hdrSampler, uv).rgb;
+	float3 hdrValue = pToneMappingParams.hdrInputTexture.Sample(pToneMappingParams.hdrSampler, uv).rgb;
-    //float3 value = agx(hdrValue);
+    float avgLum = pToneMappingParams.averageLuminance[0];
-    //value = agxLook(value);
-    //value = agxEotf(value);
     
-    float3 value = hdrValue / (hdrValue + float3(10));
+    float3 value = agx(hdrValue);
+    value = agxLook(value, avgLum);
+    value = agxEotf(value);
 
     return float4(value, 1);
 }

res/shaders/raytracing/AnyHit.slang

@@ -7,8 +7,6 @@ import StaticMeshVertexData;
 [shader("anyhit")]
 void anyhit(inout RayPayload hitValue, in BuiltInTriangleIntersectionAttributes attr)
 {
-    if(RayTCurrent() > hitValue.t)
-        return;
     const float3 barycentricCoords = float3(1.0f - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y);
 
     InstanceData inst = pScene.instances[InstanceID()];

res/shaders/test.slang

@@ -1,44 +0,0 @@
-    const static float2 positions[3] = {
-      float2(0.0, -0.5),
-      float2(0.5, 0.5),
-      float2(-0.5, 0.5)
-    };
-
-    const static float3 colors[3] = {
-      float3(1.0, 1.0, 0.0),
-      float3(0.0, 1.0, 1.0),
-      float3(1.0, 0.0, 1.0)
-    };
-    struct Vertex
-    {
-      float4 pos : SV_Position;
-      float3 color : Color;
-      int index : Index;
-    };
-
-    const static uint MAX_VERTS = 12;
-    const static uint MAX_PRIMS = 4;
-
-    [outputtopology("triangle")]
-    [shader("mesh")]
-    [numthreads(3, 1, 1)]
-    void meshMain(
-        in uint tig : SV_GroupIndex,
-        out Vertices<Vertex, MAX_VERTS> verts,
-        out Indices<uint3, MAX_PRIMS> triangles)
-    {
-        const uint numVertices = 12;
-        const uint numPrimitives = 4;
-        SetMeshOutputCounts(numVertices, numPrimitives);
-
-        for(uint i = tig; i < numVertices; ++i)
-        {
-            const int tri = i / 3;
-            verts[i] = {float4(positions[i % 3], 0, 1), colors[i % 3], tri};
-        }
-
-        for(uint i = tig; i < numPrimitives; ++i)
-        {
-            triangles[i] = i * 3 + uint3(0,1,2);
-        }
-    }

src/Engine/Graphics/RenderPass/ToneMappingPass.cpp

@@ -3,43 +3,121 @@
 using namespace Seele;
 
 ToneMappingPass::ToneMappingPass(Gfx::PGraphics graphics) : RenderPass(graphics) {
-    layout = graphics->createDescriptorLayout("ToneMappingDescriptor");
+    tonemappingLayout = graphics->createDescriptorLayout("ToneMappingDescriptor");
-    layout->addDescriptorBinding(Gfx::DescriptorBinding{
+    tonemappingLayout->addDescriptorBinding(Gfx::DescriptorBinding{
         .name = "offset",
         .uniformLength = sizeof(Vector4),
     });
-    layout->addDescriptorBinding(Gfx::DescriptorBinding{
+    tonemappingLayout->addDescriptorBinding(Gfx::DescriptorBinding{
         .name = "slope",
         .uniformLength = sizeof(Vector4),
     });
-    layout->addDescriptorBinding(Gfx::DescriptorBinding{
+    tonemappingLayout->addDescriptorBinding(Gfx::DescriptorBinding{
         .name = "power",
         .uniformLength = sizeof(Vector4),
     });
-    layout->addDescriptorBinding(Gfx::DescriptorBinding{
+    tonemappingLayout->addDescriptorBinding(Gfx::DescriptorBinding{
         .name = "sat",
         .uniformLength = sizeof(float),
     });
-    layout->addDescriptorBinding(Gfx::DescriptorBinding{
+    tonemappingLayout->addDescriptorBinding(Gfx::DescriptorBinding{
         .name = "hdrInputTexture",
         .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
     });
-    layout->addDescriptorBinding(Gfx::DescriptorBinding{
+    tonemappingLayout->addDescriptorBinding(Gfx::DescriptorBinding{
         .name = "hdrSampler",
         .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_SAMPLER,
     });
-    layout->create();
+    tonemappingLayout->addDescriptorBinding(Gfx::DescriptorBinding{
-    pipelineLayout = graphics->createPipelineLayout("ToneMappingLayout");
+        .name = "averageLuminance",
-    pipelineLayout->addDescriptorLayout(layout);
+        .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+    });
+    tonemappingLayout->create();
+    tonemappingPipelineLayout = graphics->createPipelineLayout("ToneMappingLayout");
+    tonemappingPipelineLayout->addDescriptorLayout(tonemappingLayout);
+
     graphics->beginShaderCompilation(ShaderCompilationInfo{
         .name = "ToneMapping",
         .modules = {"FullScreenQuad", "ToneMapping"},
-        .entryPoints = {{"quadMain", "FullScreenQuad"}, {"toneMapping", "ToneMapping"}},
+        .entryPoints =
-        .rootSignature = pipelineLayout,
+            {
+                {"quadMain", "FullScreenQuad"},
+                {"toneMapping", "ToneMapping"},
+            },
+        .rootSignature = tonemappingPipelineLayout,
     });
-    pipelineLayout->create();
+    tonemappingPipelineLayout->create();
     vert = graphics->createVertexShader({0});
     frag = graphics->createFragmentShader({1});
+
+    histogramLayout = graphics->createDescriptorLayout("pHistogramParams");
+    histogramLayout->addDescriptorBinding(Gfx::DescriptorBinding{
+        .name = "minLogLum",
+        .uniformLength = sizeof(float),
+    });
+    histogramLayout->addDescriptorBinding(Gfx::DescriptorBinding{
+        .name = "inverseLogLumRange",
+        .uniformLength = sizeof(float),
+    });
+    histogramLayout->addDescriptorBinding(Gfx::DescriptorBinding{
+        .name = "timeCoeff",
+        .uniformLength = sizeof(float),
+    });
+    histogramLayout->addDescriptorBinding(Gfx::DescriptorBinding{
+        .name = "numPixels",
+        .uniformLength = sizeof(uint32),
+    });
+    histogramLayout->addDescriptorBinding(Gfx::DescriptorBinding{
+        .name = "hdrImage",
+        .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
+    });
+    histogramLayout->addDescriptorBinding(Gfx::DescriptorBinding{
+        .name = "histogram",
+        .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+    });
+    histogramLayout->addDescriptorBinding(Gfx::DescriptorBinding{
+        .name = "averageLuminance",
+        .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+    });
+    histogramLayout->create();
+    histogramPipelineLayout = graphics->createPipelineLayout("HistogramPipelineLayout");
+    histogramPipelineLayout->addDescriptorLayout(histogramLayout);
+
+    graphics->beginShaderCompilation(ShaderCompilationInfo{
+        .name = "Exposure",
+        .modules = {"Exposure"},
+        .entryPoints =
+            {
+                {"histogram", "Exposure"},
+                {"exposure", "Exposure"},
+            },
+        .rootSignature = histogramPipelineLayout,
+    });
+    histogramPipelineLayout->create();
+    histogramShader = graphics->createComputeShader({0});
+    histogramPipeline = graphics->createComputePipeline(Gfx::ComputePipelineCreateInfo{
+        .computeShader = histogramShader,
+        .pipelineLayout = histogramPipelineLayout,
+    });
+    exposureShader = graphics->createComputeShader({1});
+    exposurePipeline = graphics->createComputePipeline(Gfx::ComputePipelineCreateInfo{
+        .computeShader = exposureShader,
+        .pipelineLayout = histogramPipelineLayout,
+    });
+    histogramBuffer = graphics->createShaderBuffer(ShaderBufferCreateInfo{
+        .sourceData =
+            {
+                .size = sizeof(uint32) * 256,
+            },
+        .name = "HistogramBuffer",
+    });
+    luminanceBuffer = graphics->createShaderBuffer(ShaderBufferCreateInfo{
+        .sourceData =
+            {
+                .size = sizeof(uint32),
+            },
+        .name = "LuminanceBuffer",
+    });
     sampler = graphics->createSampler({});
 }
 
@@ -50,18 +128,56 @@ void ToneMappingPass::beginFrame(const Component::Camera& cam) { RenderPass::beg
 void ToneMappingPass::render() {
     hdrInputTexture.getTexture()->changeLayout(Gfx::SE_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, Gfx::SE_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
                                                Gfx::SE_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, Gfx::SE_ACCESS_SHADER_READ_BIT,
-                                               Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
+                                               Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
 
-    layout->reset();
+    histogramLayout->reset();
-    set = layout->allocateDescriptorSet();
+    Gfx::PDescriptorSet histogramSet = histogramLayout->allocateDescriptorSet();
-    set->updateTexture("hdrInputTexture", 0, hdrInputTexture.getTexture());
+    histogramSet->updateConstants("minLogLum", 0, &minLogLum);
-    set->updateSampler("hdrSampler", 0, sampler);
+    histogramSet->updateConstants("inverseLogLumRange", 0, &inverseLogLumRange);
-    set->writeChanges();
+    histogramSet->updateConstants("timeCoeff", 0, &timeCoeff);
+    histogramSet->updateConstants("numPixels", 0, &numPixels);
+    histogramSet->updateTexture("hdrImage", 0, hdrInputTexture.getTexture());
+    histogramSet->updateBuffer("histogram", 0, histogramBuffer);
+    histogramSet->updateBuffer("averageLuminance", 0, luminanceBuffer);
+    histogramSet->writeChanges();
+
+    {
+        Gfx::OComputeCommand computeCommand = graphics->createComputeCommand("HistogramCommand");
+        computeCommand->bindPipeline(histogramPipeline);
+        computeCommand->bindDescriptor({histogramSet});
+        computeCommand->dispatch(threadGroups.x, threadGroups.y, 1);
+        graphics->executeCommands(std::move(computeCommand));
+    }
+    histogramBuffer->pipelineBarrier(Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+                                     Gfx::SE_ACCESS_SHADER_READ_BIT | Gfx::SE_ACCESS_SHADER_WRITE_BIT,
+                                     Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
+    {
+        Gfx::OComputeCommand computeCommand = graphics->createComputeCommand("ExposureCommand");
+        computeCommand->bindPipeline(exposurePipeline);
+        computeCommand->bindDescriptor({histogramSet});
+        computeCommand->dispatch(1, 1, 1);
+        graphics->executeCommands(std::move(computeCommand));
+    }
+    luminanceBuffer->pipelineBarrier(Gfx::SE_ACCESS_SHADER_READ_BIT | Gfx::SE_ACCESS_SHADER_WRITE_BIT,
+                                     Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+                                     Gfx::SE_ACCESS_SHADER_READ_BIT | Gfx::SE_ACCESS_SHADER_WRITE_BIT,
+                                     Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT | Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
+
+    tonemappingLayout->reset();
+    Gfx::PDescriptorSet tonemappingSet = tonemappingLayout->allocateDescriptorSet();
+    tonemappingSet->updateConstants("offset", 0, &offset);
+    tonemappingSet->updateConstants("slope", 0, &slope);
+    tonemappingSet->updateConstants("power", 0, &power);
+    tonemappingSet->updateConstants("sat", 0, &sat);
+    tonemappingSet->updateTexture("hdrInputTexture", 0, hdrInputTexture.getTexture());
+    tonemappingSet->updateSampler("hdrSampler", 0, sampler);
+    tonemappingSet->updateBuffer("averageLuminance", 0, luminanceBuffer);
+    tonemappingSet->writeChanges();
     graphics->beginRenderPass(renderPass);
     Gfx::ORenderCommand command = graphics->createRenderCommand("ToneMapping");
     command->setViewport(viewport);
     command->bindPipeline(pipeline);
-    command->bindDescriptor({set});
+    command->bindDescriptor({tonemappingSet});
     command->draw(3, 1, 0, 0);
     graphics->executeCommands(std::move(command));
     graphics->endRenderPass();
@@ -70,6 +186,8 @@ void ToneMappingPass::render() {
 void ToneMappingPass::endFrame() {}
 
 void ToneMappingPass::publishOutputs() {
+    numPixels = viewport->getWidth() * viewport->getHeight();
+    threadGroups = UVector2((viewport->getWidth() + 15) / 16, (viewport->getHeight() + 15) / 16);
     colorAttachment = Gfx::RenderTargetAttachment(viewport, Gfx::SE_IMAGE_LAYOUT_UNDEFINED, Gfx::SE_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
                                                   Gfx::SE_ATTACHMENT_LOAD_OP_DONT_CARE, Gfx::SE_ATTACHMENT_STORE_OP_STORE);
     resources->registerRenderPassOutput("TONEMAPPING_COLOR", colorAttachment);
@@ -103,7 +221,7 @@ void ToneMappingPass::createRenderPass() {
         .vertexShader = vert,
         .fragmentShader = frag,
         .renderPass = renderPass,
-        .pipelineLayout = pipelineLayout,
+        .pipelineLayout = tonemappingPipelineLayout,
         .colorBlend =
             {
                 .attachmentCount = 1,

src/Engine/Graphics/RenderPass/ToneMappingPass.h

@@ -19,13 +19,31 @@ class ToneMappingPass : public RenderPass {
   private:
     // non-hdr swapchain output
     Gfx::RenderTargetAttachment colorAttachment;
+    Gfx::OShaderBuffer histogramBuffer;
+    Gfx::OShaderBuffer luminanceBuffer;
+
+    float minLogLum = 1;
+    float inverseLogLumRange = 1;
+    float timeCoeff = 1;
+    uint32 numPixels;
+    UVector2 threadGroups;
+    Gfx::ODescriptorLayout histogramLayout;
+    Gfx::PDescriptorSet histogramSet;
+    Gfx::OPipelineLayout histogramPipelineLayout;
+    Gfx::OComputeShader histogramShader;
+    Gfx::PComputePipeline histogramPipeline;
+    Gfx::OComputeShader exposureShader;
+    Gfx::PComputePipeline exposurePipeline;
 
     Gfx::RenderTargetAttachment hdrInputTexture;
     Gfx::OSampler sampler;
 
-    Gfx::ODescriptorLayout layout;
+    Vector4 offset = Vector4(0.0);
-    Gfx::PDescriptorSet set;
+    Vector4 slope = Vector4(1.0);
-    Gfx::OPipelineLayout pipelineLayout;
+    Vector4 power = Vector4(1.0);
+    float sat = 1.0;
+    Gfx::ODescriptorLayout tonemappingLayout;
+    Gfx::OPipelineLayout tonemappingPipelineLayout;
     Gfx::OVertexShader vert;
     Gfx::OFragmentShader frag;
     Gfx::PGraphicsPipeline pipeline;

src/Engine/Graphics/Vulkan/Buffer.cpp

@@ -5,10 +5,6 @@
 #include <fmt/format.h>
 #include <vma/vk_mem_alloc.h>
 
-uint64 bufferSize = 0;
-
-uint64 getBufferSize() { return bufferSize; }
-
 using namespace Seele;
 using namespace Seele::Vulkan;
 
@@ -26,9 +22,6 @@ BufferAllocation::BufferAllocation(PGraphics graphics, const std::string& name,
         .pObjectName = name.c_str(),
     };
     vkSetDebugUtilsObjectNameEXT(graphics->getDevice(), &nameInfo);
-    if (!(properties & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
-        bufferSize += size;
-    }
     if (bufferInfo.usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT) {
         VkBufferDeviceAddressInfo addrInfo = {
             .sType = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_KHR,
@@ -41,9 +34,6 @@ BufferAllocation::BufferAllocation(PGraphics graphics, const std::string& name,
 
 BufferAllocation::~BufferAllocation() {
     if (buffer != VK_NULL_HANDLE) {
-        if (!(properties & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
-            bufferSize -= size;
-        }
         vmaDestroyBuffer(graphics->getAllocator(), buffer, allocation);
     }
 }

src/Engine/Graphics/Vulkan/Buffer.h

@@ -4,8 +4,6 @@
 #include "Graphics/Enums.h"
 #include "Resources.h"
 
-uint64 getBufferSize();
-
 namespace Seele {
 namespace Vulkan {
 DECLARE_REF(Command)