fixed descriptors

examples/VulkanAnimation/closesthit.glsl

@@ -0,0 +1,12 @@
+#version 460
+#extension GL_EXT_ray_tracing : enable
+#extension GL_EXT_nonuniform_qualifier : enable
+
+layout(location = 0) rayPayloadInEXT vec3 hitValue;
+hitAttributeEXT vec2 attribs;
+
+void main()
+{
+  const vec3 barycentricCoords = vec3(1.0f - attribs.x - attribs.y, attribs.x, attribs.y);
+  hitValue = barycentricCoords;
+}

examples/VulkanAnimation/main.cpp

@@ -0,0 +1,128 @@
+#include <vulkan/vulkan.h>
+
+import Crafter.Graphics;
+using namespace Crafter;
+import std;
+import Crafter.Event;
+import Crafter.Math;
+
+typedef VulkanShader<"raygen.spv", "main", VK_SHADER_STAGE_RAYGEN_BIT_KHR, 2, {{{VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR, 0}, {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1}}}> Raygenspv;
+typedef VulkanShader<"closesthit.spv", "main", VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR, 0, {{}}> Closesthitspv;
+typedef VulkanShader<"miss.spv", "main", VK_SHADER_STAGE_MISS_BIT_KHR, 0, {{}}> Misspv;
+
+int main() {
+    /*
+        This sets up all necessary things and creates the vulkan device.
+        This must be called before any vulkan related things.
+        Things like VkDevice are static members of the VulkanDevice class.
+    */
+    VulkanDevice::CreateDevice();
+    Raygenspv::CreateShader();
+    Closesthitspv::CreateShader();
+    Misspv::CreateShader();
+    DescriptorLayoutVulkan<Raygenspv, Closesthitspv, Misspv>::Init();
+    PipelineRTVulkan<Raygenspv, Closesthitspv, Misspv, Raygenspv, Closesthitspv, Misspv>::Init();
+    DescriptorPool<1, Raygenspv, Closesthitspv, Misspv> pool;
+    pool.setsCount = 2;
+    pool.BuildPool(0);
+
+    WindowVulkan window(1280, 720, "HelloVulkan");
+
+    /*
+        StartInit gives you a VkCommandBuffer to use before the event loop starts
+        Use this for inititializing things like textures.
+    */
+    VkCommandBuffer cmd = window.StartInit();
+
+    Mesh triangleMesh;
+    std::array<Vertex, 3> verts {{{-150, -150, 100}, {0, 150, 100}, {150, -150, 100}}};
+    std::array<std::uint32_t, 3> index {{2,1,0}};
+    triangleMesh.Build(verts, index, cmd);
+    RenderingElement3DVulkan& el = RenderingElement3DVulkan::elements.emplace_back(triangleMesh);
+    MatrixRowMajor<float, 4, 3, 1> transform = MatrixRowMajor<float, 4, 3, 1>::Identity();
+    std::memcpy(el.instance.transform.matrix, transform.m, sizeof(transform.m));
+    RenderingElement3DVulkan::tlases.resize(2);
+
+    window.SetPipelineRT<Raygenspv, Closesthitspv, Misspv, Raygenspv, Closesthitspv, Misspv>();
+    window.descriptorsRt = pool.sets;
+
+    RenderingElement3DVulkan::BuildTLAS(cmd, 0);
+    VkDescriptorImageInfo imageInfo = {
+        .imageView = window.imageViews[0],
+        .imageLayout = VK_IMAGE_LAYOUT_GENERAL
+    };
+
+    VkWriteDescriptorSetAccelerationStructureKHR writeDescriptorSetAccelerationStructure {
+        .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR,
+        .accelerationStructureCount = 1,
+        .pAccelerationStructures = &RenderingElement3DVulkan::tlases[0].accelerationStructure
+    };
+
+    VkWriteDescriptorSet write[2] = {
+        {
+            .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+            .pNext = &writeDescriptorSetAccelerationStructure,
+            .dstSet = pool.sets[0],
+            .dstBinding = 0,
+            .dstArrayElement = 0,
+            .descriptorCount = 1,
+            .descriptorType = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
+        },
+        {
+            .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+            .dstSet = pool.sets[0],
+            .dstBinding = 1,
+            .dstArrayElement = 0,
+            .descriptorCount = 1,
+            .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
+            .pImageInfo = &imageInfo
+        }
+    };
+    vkUpdateDescriptorSets(VulkanDevice::device, 2, write, 0, nullptr);
+
+    /*
+        FinishInit executes all commands recorded to StartInit.
+        This must be called before the the event loops starts if you called StartInit before.
+    */
+    window.FinishInit();
+
+    EventListener<VkCommandBuffer> updateListener(&window.onRender, [&](VkCommandBuffer cmd){
+        RenderingElement3DVulkan::BuildTLAS(cmd, window.currentBuffer);
+        VkDescriptorImageInfo imageInfo = {
+            .imageView = window.imageViews[window.currentBuffer],
+            .imageLayout = VK_IMAGE_LAYOUT_GENERAL
+        };
+
+        VkWriteDescriptorSetAccelerationStructureKHR writeDescriptorSetAccelerationStructure {
+            .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR,
+            .accelerationStructureCount = 1,
+            .pAccelerationStructures = &RenderingElement3DVulkan::tlases[window.currentBuffer].accelerationStructure
+        };
+
+        VkWriteDescriptorSet write[2] = {
+            {
+                .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+                .pNext = &writeDescriptorSetAccelerationStructure,
+                .dstSet = pool.sets[window.currentBuffer],
+                .dstBinding = 0,
+                .dstArrayElement = 0,
+                .descriptorCount = 1,
+                .descriptorType = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
+            },
+            {
+                .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+                .dstSet = pool.sets[window.currentBuffer],
+                .dstBinding = 1,
+                .dstArrayElement = 0,
+                .descriptorCount = 1,
+                .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
+                .pImageInfo = &imageInfo
+            }
+        };
+        vkUpdateDescriptorSets(VulkanDevice::device, 2, write, 0, nullptr);
+    });
+    
+    window.Render();
+	window.StartUpdate();
+    window.StartSync();
+}

examples/VulkanAnimation/miss.glsl

@@ -0,0 +1,9 @@
+#version 460
+#extension GL_EXT_ray_tracing : enable
+
+layout(location = 0) rayPayloadInEXT vec3 hitValue;
+
+void main()
+{
+    hitValue = vec3(1, 1, 1);
+}

examples/VulkanAnimation/project.json

@@ -0,0 +1,32 @@
+{
+    "name": "crafter-graphics",
+    "configurations": [
+        {
+            "name": "executable",
+            "implementations": ["main"],
+            "dependencies": [
+                {
+                    "path":"../../project.json",
+                    "configuration":"lib-vulkan-debug"
+                }
+            ],
+            "shaders": [
+                {
+                    "path":"raygen.glsl",
+                    "type": 6,
+                    "entrypoint":"main"
+                },
+                {
+                    "path":"closesthit.glsl",
+                    "type": 9,
+                    "entrypoint":"main"
+                },
+                {
+                    "path":"miss.glsl",
+                    "type": 10,
+                    "entrypoint":"main"
+                }
+            ]
+        }
+    ]
+}

examples/VulkanAnimation/raygen.glsl

@@ -0,0 +1,47 @@
+#version 460
+#extension GL_EXT_ray_tracing : enable
+#extension GL_EXT_shader_image_load_formatted : enable
+
+layout(binding = 0, set = 0) uniform accelerationStructureEXT topLevelAS;
+layout(binding = 1, set = 0, rgba8) uniform writeonly image2D image;
+
+layout(location = 0) rayPayloadEXT vec3 hitValue;
+
+void main()
+{
+    // Pixel coordinates
+    uvec2 pixel = gl_LaunchIDEXT.xy;
+    uvec2 resolution = gl_LaunchSizeEXT.xy;
+
+    // Normalized coordinates in range [-1, 1]
+    vec2 uv = (vec2(pixel) + 0.5) / vec2(resolution);
+    vec2 ndc = uv * 2.0 - 1.0;
+
+    // Camera parameters
+    vec3 origin = vec3(0.0, 0.0, -300.0);
+
+    float aspect = float(resolution.x) / float(resolution.y);
+    float fov = radians(60.0);
+    float tanHalfFov = tan(fov * 0.5);
+
+    // Simple pinhole camera facing +Z
+    vec3 direction = normalize(vec3(
+        ndc.x * aspect * tanHalfFov,
+        -ndc.y * tanHalfFov,
+        1.0
+    ));
+
+    traceRayEXT(
+        topLevelAS,
+        gl_RayFlagsNoneEXT,
+        0xff,
+        0, 0, 0,
+        origin,
+        0.001,
+        direction,
+        10000.0,
+        0
+    );
+
+    imageStore(image, ivec2(pixel), vec4(hitValue, 1.0));
+}