switched from combined image to sampled image and sampler

Author: JeanPhilippeKernel

Resources/Shaders/fragment_common.glsl

@@ -61,7 +61,7 @@ layout(std140, set = 0, binding = 5) readonly buffer MatSB
 }
 MaterialDataBuffer;
 
-layout(set = 1, binding = 0) uniform Texture2D TextureArray[];
+layout(set = 1, binding = 0) uniform texture2D TextureArray[];
 layout(set = 1, binding = 1) uniform sampler LinearWrapSampler;
 
 MaterialData FetchMaterial(uint dataIndex)

Resources/Shaders/g_buffer.frag

@@ -24,18 +24,18 @@ void main()
     if (material.AlbedoMap < INVALID_MAP_HANDLE)
     {
         uint texId = uint(material.AlbedoMap);
-        OutAlbedo  = texture(TextureArray[nonuniformEXT(texId)], TexCoord);
+        OutAlbedo  = texture(sampler2D(TextureArray[nonuniformEXT(texId)], LinearWrapSampler), TexCoord);
     }
 
     if (material.SpecularMap < INVALID_MAP_HANDLE)
     {
         uint texId  = uint(material.SpecularMap);
-        OutSpecular = texture(TextureArray[nonuniformEXT(texId)], TexCoord);
+        OutSpecular = texture(sampler2D(TextureArray[nonuniformEXT(texId)], LinearWrapSampler), TexCoord);
     }
 
     if (material.NormalMap < INVALID_MAP_HANDLE)
     {
         uint texId = uint(material.NormalMap);
-        OutNormal  = texture(TextureArray[nonuniformEXT(texId)], TexCoord).rgb;
+        OutNormal  = texture(sampler2D(TextureArray[nonuniformEXT(texId)], LinearWrapSampler), TexCoord).rgb;
     }
-}
+}

Resources/Shaders/imgui.frag

@@ -2,8 +2,9 @@
 #extension GL_EXT_nonuniform_qualifier : require
 
 layout(location = 0) out vec4 fColor;
-layout(set = 0, binding = 0) uniform sampler2D _unused;
-layout(set = 1, binding = 0) uniform sampler2D TextureArray[];
+layout(set = 0, binding = 0) uniform sampler _unused;
+layout(set = 1, binding = 0) uniform texture2D TextureArray[];
+layout(set = 1, binding = 1) uniform sampler LinearWrapSampler;
 
 layout(location = 0) in struct
 {
@@ -14,6 +15,6 @@ layout(location = 0) in struct
 void main()
 {
     uint texId  = uint(floor(In.TexData.z + 0.5));
-    vec4 texVal = texture(TextureArray[nonuniformEXT(texId)], In.TexData.xy);
+    vec4 texVal = texture(sampler2D(TextureArray[nonuniformEXT(texId)], LinearWrapSampler), In.TexData.xy);
     fColor      = In.Color * texVal;
 }

Resources/Shaders/skybox.frag

@@ -2,9 +2,10 @@
 layout(location = 0) in vec3 dir;
 layout(location = 0) out vec4 outColor;
 
-layout(set = 0, binding = 1) uniform samplerCube EnvMap;
+layout(set = 0, binding = 1) uniform textureCube EnvMap;
+layout(set = 1, binding = 1) uniform sampler LinearWrapSampler;
 
 void main()
 {
-    outColor = texture(EnvMap, dir);
+    outColor = texture(samplerCube(EnvMap, LinearWrapSampler), dir);
 }

ZEngine/ZEngine/Applications/AppRenderPipeline.cpp

@@ -58,7 +58,7 @@ namespace ZEngine::Applications
         // {
         //     auto thread_idx                             = render_worker_thread_idx + worker_thread_idx;
         // }
-        CurrentCmdBuf = Device->CommandBufferMgr->GetCommandBuffer(swpachain->CurrentFrame->Index, RenderMainThreadIndex, 0, true);
+        CurrentCmdBuf = Device->CommandBufferMgr->GetCommandBuffer(Rendering::QueueType::GRAPHIC_QUEUE, swpachain->CurrentFrame->Index, RenderMainThreadIndex, 0, true);
     }
 
     void AppRenderPipeline::EndFrame()
@@ -69,6 +69,10 @@ namespace ZEngine::Applications
 
     void AppRenderPipeline::RenderScene(Rendering::Cameras::CameraPtr camera, Rendering::Scenes::RenderScenePtr scene)
     {
+        auto swpachain    = Device->SwapchainPtr;
+        auto frame_index  = swpachain->CurrentFrame->Index;
+        auto thread_index = RenderMainThreadIndex;
+
         if (scene->TransformBufferDirty[Device->SwapchainPtr->CurrentFrame->Index].load(std::memory_order_acquire) || scene->MeshAllocationDirty[Device->SwapchainPtr->CurrentFrame->Index].load(std::memory_order_acquire))
         {
             auto  gpu_scene_data       = SceneRenderer->RenderSceneData;
@@ -91,7 +95,7 @@ namespace ZEngine::Applications
             if (scene->TransformBufferDirty[Device->SwapchainPtr->CurrentFrame->Index].exchange(false, std::memory_order_acquire))
             {
                 auto transform_data_view = ArrayView{scene->GlobalTransforms};
-                transform_buffer->Write(transform_data_view);
+                transform_buffer->Write(frame_index, thread_index, transform_data_view);
             }
 
             if (scene->MeshAllocationDirty[Device->SwapchainPtr->CurrentFrame->Index].exchange(false, std::memory_order_acquire))
@@ -124,20 +128,20 @@ namespace ZEngine::Applications
                 auto sub_mesh_alloc_view    = ArrayView{SubMeshAllocations};
                 auto indirect_commands_view = ArrayView{DrawIndirectCommands};
 
-                vtx_buffer->Write(vertex_data_view);
-                idx_buffer->Write(index_data_view);
+                vtx_buffer->Write(frame_index, thread_index, vertex_data_view);
+                idx_buffer->Write(frame_index, thread_index, index_data_view);
 
-                rd_buffer->Write(sub_mesh_alloc_view);
+                rd_buffer->Write(frame_index, thread_index, sub_mesh_alloc_view);
 
-                indirect_buffer->Write(indirect_commands_view);
+                indirect_buffer->Write(frame_index, thread_index, indirect_commands_view);
 
                 ZReleaseScratch(scratch);
             }
         }
 
         // Todo (Kernel) : When we'll start considering multithreaded support
         // we might want to renderer->EnqueueAsync({command_buffer, {camera, frame_data} })
-        SceneRenderer->DrawScene(CurrentCmdBuf, camera);
+        SceneRenderer->DrawScene(frame_index, thread_index, CurrentCmdBuf, camera);
     }
 
     void AppRenderPipeline::BeginOverlayFrame()
@@ -157,6 +161,10 @@ namespace ZEngine::Applications
             return;
         }
 
+        auto swpachain           = Device->SwapchainPtr;
+        auto frame_index         = swpachain->CurrentFrame->Index;
+        auto thread_index        = RenderMainThreadIndex;
+
         auto current_framebuffer = Device->SwapchainPtr->SwapchainFramebuffers[Device->SwapchainPtr->CurrentFrame->ImageIndex];
 
         CurrentCmdBuf->BeginRenderPass(ImguiRenderer->UIPass, current_framebuffer, true);
@@ -170,10 +178,10 @@ namespace ZEngine::Applications
             auto vertex_buffer     = vertex_buffer_set->At(Device->SwapchainPtr->CurrentFrame->Index);
             auto index_buffer      = index_buffer_set->At(Device->SwapchainPtr->CurrentFrame->Index);
 
-            vertex_buffer->Write(vtx_data_view);
-            index_buffer->Write(idx_data_view);
+            vertex_buffer->Write(frame_index, thread_index, vtx_data_view);
+            index_buffer->Write(frame_index, thread_index, idx_data_view);
 
-            auto ui_second_cb = Device->CommandBufferMgr->GetCommandBuffer(Device->SwapchainPtr->CurrentFrame->Index, RenderMainThreadIndex, UICommandBufferIndex, false);
+            auto ui_second_cb = Device->CommandBufferMgr->GetCommandBuffer(Rendering::QueueType::GRAPHIC_QUEUE, Device->SwapchainPtr->CurrentFrame->Index, RenderMainThreadIndex, UICommandBufferIndex, false);
             ui_second_cb->ResetState();
             ui_second_cb->BeginSecondary(ImguiRenderer->UIPass, current_framebuffer);
             ui_second_cb->SetViewport(ImguiRenderer->UIPass->GetRenderAreaWidth(), ImguiRenderer->UIPass->GetRenderAreaHeight());

ZEngine/ZEngine/Applications/AppRenderPipeline.h

@@ -2,10 +2,17 @@
 #include <Hardwares/VulkanDevice.h>
 #include <Rendering/Renderers/GraphicRenderer.h>
 #include <Rendering/Renderers/ImGUIRenderer.h>
+#include <new>
 
 namespace ZEngine::Applications
 {
-    struct alignas(std::hardware_destructive_interference_size) PaddedAtomicInt
+#ifdef __cpp_lib_hardware_interference_size
+    constexpr auto CACHE_LINE_SIZE = std::hardware_destructive_interference_size;
+#else
+    constexpr auto CACHE_LINE_SIZE = 64;
+#endif
+
+    struct alignas(CACHE_LINE_SIZE) PaddedAtomicInt
     {
         std::atomic_uint32_t value = 0;
     };