]> O.S.I.I.S - jp/vke.net.git/commitdiff
shaderc.net integration
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Tue, 5 May 2020 15:09:49 +0000 (17:09 +0200)
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Tue, 5 May 2020 15:09:49 +0000 (17:09 +0200)
65 files changed:
Directory.Build.props
addons/EnvironmentPipeline/EnvironmentPipeline.cs
addons/VkvgPipeline/VkvgPipeline.cs
samples/Directory.Build.props
samples/DistanceFieldFontTest/Program.cs
samples/Model/Model.csproj
samples/Model/main.cs
samples/RayTests/DebuDrawPipeline.cs [new file with mode: 0644]
samples/RayTests/EnvironmentPipeline.cs [new file with mode: 0644]
samples/RayTests/RayTests.csproj [new file with mode: 0644]
samples/RayTests/main-crow.cs [new file with mode: 0644]
samples/RayTests/main.cs [new file with mode: 0644]
samples/RayTests/mainShadow.cs [new file with mode: 0644]
samples/RayTests/mainWithDebugDrawer.cs [new file with mode: 0644]
samples/RayTests/modelWithVkvgStats.cs [new file with mode: 0644]
samples/RayTests/shaders/GBuffPbr.vert [new file with mode: 0644]
samples/RayTests/shaders/GBuffPbrCommon.inc [new file with mode: 0644]
samples/RayTests/shaders/GBuffPbrTexArray.frag [new file with mode: 0644]
samples/RayTests/shaders/compose.frag [new file with mode: 0644]
samples/RayTests/shaders/debug.frag [new file with mode: 0644]
samples/RayTests/shaders/debug.vert [new file with mode: 0644]
samples/RayTests/shaders/emissive.frag [new file with mode: 0644]
samples/RayTests/shaders/show_gbuff.frag [new file with mode: 0644]
samples/RayTests/shaders/simpletexture.frag [new file with mode: 0644]
samples/RayTests/shaders/skybox.frag [new file with mode: 0644]
samples/RayTests/shadowMapRenderer.cs [new file with mode: 0644]
samples/RayTests/ui/debug.crow [new file with mode: 0644]
samples/RayTests/ui/deferred.style [new file with mode: 0644]
samples/RayTests/ui/main.crow [new file with mode: 0644]
samples/RayTests/ui/materials.crow [new file with mode: 0644]
samples/RayTests/ui/menu.crow [new file with mode: 0644]
samples/RayTests/ui/sceneItem.crow [new file with mode: 0644]
samples/RayTests/ui/scenes.crow [new file with mode: 0644]
samples/RayTests/ui/testImage.crow [new file with mode: 0644]
samples/Textured/main.cs
samples/TexturedCube/main.cs
samples/Triangle/main.cs
samples/compute/delaunay.cs
samples/deferred/DeferredPbrRenderer.cs
samples/deferred/main.cs
samples/deferred/shaders/shadow.geom
samples/deferred/shaders/shadow.vert
samples/deferred/shadowMapRenderer.cs
samples/pbr/PbrPipeline.cs
samples/vkeEditor/FSQPipeline.cs [new file with mode: 0644]
samples/vkeEditor/ObservablePipelineConfig.cs [new file with mode: 0644]
samples/vkeEditor/Program.cs [new file with mode: 0644]
samples/vkeEditor/VkFormatWidget.cs [new file with mode: 0644]
samples/vkeEditor/shaders/main.frag [new file with mode: 0644]
samples/vkeEditor/shaders/main.vert [new file with mode: 0644]
samples/vkeEditor/ui/main.crow [new file with mode: 0755]
samples/vkeEditor/ui/testImage.crow [new file with mode: 0644]
samples/vkeEditor/vkeEditor.csproj [new file with mode: 0644]
vke.net.sln
vke/src/ExtensionMethods.cs
vke/src/ShaderInfo.cs
vke/src/base/ComputePipeline.cs
vke/src/base/DebuDrawPipeline.cs
vke/src/base/DescriptorPool.cs
vke/src/base/Device.cs
vke/src/base/Fence.cs
vke/src/base/GraphicPipeline.cs
vke/src/base/GraphicPipelineConfig.cs
vke/src/base/Image.cs
vke/vke.csproj

index a1d0170a12522fcde7ec7ee56e051d638a6a96c8..56542853f64fc3d173e98bb4d0f1228ed23287e2 100644 (file)
@@ -4,7 +4,7 @@
                <RestoreAdditionalProjectSources Condition="Exists('$(SolutionDir)build\$(Configuration)\')">$(SolutionDir)build\$(Configuration)\</RestoreAdditionalProjectSources>
                <SpirVTasksReleaseVersion>0.1.44</SpirVTasksReleaseVersion>
                <SpirVTasksPackageVersion>$(SpirVTasksReleaseVersion)-beta</SpirVTasksPackageVersion>
-               <VkeReleaseVersion>0.1.15</VkeReleaseVersion>
+               <VkeReleaseVersion>0.1.16</VkeReleaseVersion>
                <VkePackageVersion>$(VkeReleaseVersion)-beta</VkePackageVersion>
                
                <LangVersion>7.2</LangVersion>
index 0692a460bb361b121eb239e7ea357291713f8fc6..017da48135b26fd0b799c9ea2d51969fb2f9272e 100644 (file)
@@ -33,14 +33,19 @@ namespace vke.Environment {
                                cfg.Layout = plLayout;
                                cfg.AddVertexBinding (0, 3 * sizeof (float));
                                cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat);
-                               cfg.AddShader (VkShaderStageFlags.Vertex, "#EnvironmentPipeline.skybox.vert.spv");
-                               cfg.AddShader (VkShaderStageFlags.Fragment, STR_FRAG_PATH);
+                               cfg.AddShaders (
+                                       new ShaderInfo (Dev, VkShaderStageFlags.Vertex, "#EnvironmentPipeline.skybox.vert.spv"),
+                                       new ShaderInfo (Dev, VkShaderStageFlags.Fragment, STR_FRAG_PATH)
+                               );
+
                                cfg.multisampleState.rasterizationSamples = Samples;
 
                                layout = cfg.Layout;
 
                                init (cfg);
 
+                               cfg.DisposeShaders ();
+
                                generateBRDFLUT (staggingQ, cmdPool);
                                generateCubemaps (staggingQ, cmdPool);
                        }
@@ -119,10 +124,12 @@ namespace vke.Environment {
                        cfg.RenderPass.AddAttachment (format, VkImageLayout.ShaderReadOnlyOptimal);
                        cfg.RenderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0, 0, 0) });
                        cfg.RenderPass.AddSubpass (new SubPass (VkImageLayout.ColorAttachmentOptimal));
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#EnvironmentPipeline.genbrdflut.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#EnvironmentPipeline.genbrdflut.frag.spv");
+                       cfg.AddShaders (
+                               new ShaderInfo (Dev, VkShaderStageFlags.Vertex, "#EnvironmentPipeline.genbrdflut.vert.spv"),
+                               new ShaderInfo (Dev, VkShaderStageFlags.Fragment, "#EnvironmentPipeline.genbrdflut.frag.spv"));
 
                        using (GraphicPipeline pl = new GraphicPipeline (cfg)) {
+                               cfg.DisposeShaders ();
                                using (FrameBuffer fb = new FrameBuffer (cfg.RenderPass, dim, dim, lutBrdf)) {
                                        PrimaryCommandBuffer cmd = cmdPool.AllocateCommandBuffer ();
                                        cmd.Start (VkCommandBufferUsageFlags.OneTimeSubmit);
@@ -138,6 +145,7 @@ namespace vke.Environment {
                                        cmd.Free ();
                                }
                        }
+
                        lutBrdf.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
                }
 
@@ -191,11 +199,11 @@ namespace vke.Environment {
                        cfg.AddVertexBinding (0, 3 * sizeof (float));
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#EnvironmentPipeline.filtercube.vert.spv");
+                       cfg.AddShaders (new ShaderInfo (Dev, VkShaderStageFlags.Vertex, "#EnvironmentPipeline.filtercube.vert.spv"));
                        if (target == CBTarget.PREFILTEREDENV)
-                               cfg.AddShader (VkShaderStageFlags.Fragment, "#EnvironmentPipeline.prefilterenvmap.frag.spv");
+                               cfg.AddShaders (new ShaderInfo (Dev, VkShaderStageFlags.Fragment, "#EnvironmentPipeline.prefilterenvmap.frag.spv"));
                        else
-                               cfg.AddShader (VkShaderStageFlags.Fragment, "#EnvironmentPipeline.irradiancecube.frag.spv");
+                               cfg.AddShaders (new ShaderInfo (Dev, VkShaderStageFlags.Fragment, "#EnvironmentPipeline.irradiancecube.frag.spv"));
 
                        Matrix4x4[] matrices = {
                                // POSITIVE_X
@@ -215,7 +223,7 @@ namespace vke.Environment {
                        VkImageSubresourceRange subRes = new VkImageSubresourceRange (VkImageAspectFlags.Color, 0, numMips, 0, 6);
 
                        using (GraphicPipeline pl = new GraphicPipeline (cfg)) {
-
+                               cfg.DisposeShaders ();
                                DescriptorSet dset = dsPool.Allocate (dsLayout);
                                DescriptorSetWrites dsUpdate = new DescriptorSetWrites (dsLayout);
                                dsUpdate.Write (Dev, dset, cubemap.Descriptor);
@@ -288,6 +296,7 @@ namespace vke.Environment {
                                        cmd.Free ();
                                }
                        }
+
                        cmap.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
 
                        dsLayout.Dispose ();
index 5d9fc5295a9cec9a041d1438312242a0a806d1f6..a2df026f5e308bec3f6bc1f6c7890ff98aad41ee 100644 (file)
@@ -11,7 +11,7 @@ namespace VkvgPipeline {
        public class VkvgPipeline : GraphicPipeline {
                vkvg.Device vkvgDev;
                vkvg.Surface vkvgSurf;
-               Image uiImage;
+               public Image Texture { get; private set; }
 
                public vkvg.Context CreateContext () => new vkvg.Context (vkvgSurf);
 
@@ -21,8 +21,8 @@ namespace VkvgPipeline {
                        GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, this.RenderPass.Samples, false);
                        cfg.RenderPass = RenderPass;
                        cfg.Layout = pipeline.Layout;
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#vke.simpletexture.frag.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#vke.simpletexture.frag.spv");
                        cfg.multisampleState.rasterizationSamples = Samples;
 
                        cfg.blendAttachments[0] = new VkPipelineColorBlendAttachmentState (true);
@@ -31,36 +31,34 @@ namespace VkvgPipeline {
 
                        init (cfg);
 
+                       cfg.DisposeShaders ();
+
                        vkvgDev = new vkvg.Device (instance.Handle, dev.phy.Handle, dev.VkDev.Handle, queue.qFamIndex,
                                vkvg.SampleCount.Sample_4, queue.index);                                
                }
 
                void initUISurface (int width, int height) {
-                       uiImage?.Dispose ();
+                       Texture?.Dispose ();
                        vkvgSurf?.Dispose ();
                        vkvgSurf = new vkvg.Surface (vkvgDev, width, height);
-                       uiImage = new Image (Dev, new VkImage ((ulong)vkvgSurf.VkImage.ToInt64 ()), VkFormat.B8g8r8a8Unorm,
+                       Texture = new Image (Dev, new VkImage ((ulong)vkvgSurf.VkImage.ToInt64 ()), VkFormat.B8g8r8a8Unorm,
                                VkImageUsageFlags.ColorAttachment, (uint)vkvgSurf.Width, (uint)vkvgSurf.Height);
-                       uiImage.CreateView (VkImageViewType.ImageView2D, VkImageAspectFlags.Color);
-                       uiImage.CreateSampler (VkFilter.Nearest, VkFilter.Nearest, VkSamplerMipmapMode.Nearest, VkSamplerAddressMode.ClampToBorder);
-                       uiImage.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+                       Texture.CreateView (VkImageViewType.ImageView2D, VkImageAspectFlags.Color);
+                       Texture.CreateSampler (VkFilter.Nearest, VkFilter.Nearest, VkSamplerMipmapMode.Nearest, VkSamplerAddressMode.ClampToBorder);
+                       Texture.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
                }
 
 
                public void Resize (int width, int height, DescriptorSetWrites dsUpdate) {
                        initUISurface (width, height);
-                       dsUpdate.Write (Dev, uiImage.Descriptor);
+                       dsUpdate.Write (Dev, Texture.Descriptor);
                }
                public void RecordDraw (PrimaryCommandBuffer cmd) {
                        Bind (cmd);
 
-                       uiImage.SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.ColorAttachmentOptimal, VkImageLayout.ShaderReadOnlyOptimal,
-                               VkPipelineStageFlags.ColorAttachmentOutput, VkPipelineStageFlags.FragmentShader);
 
                        cmd.Draw (3, 1, 0, 0);
 
-                       uiImage.SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.ShaderReadOnlyOptimal, VkImageLayout.ColorAttachmentOptimal,
-                               VkPipelineStageFlags.FragmentShader, VkPipelineStageFlags.BottomOfPipe);
                }
                public void DrawResources (vkvg.Context ctx, int width, int height) {
                        ResourceManager rm = Dev.resourceManager;
@@ -124,7 +122,7 @@ namespace VkvgPipeline {
                        }
                }
                protected override void Dispose (bool disposing) {
-                       uiImage?.Dispose ();
+                       Texture?.Dispose ();
                        vkvgSurf?.Dispose ();
                        vkvgDev.Dispose ();
 
index 2fbe0d7d5de9f542d9e23f5143c24e07322fc9eb..899a632a7e1b4a2d07d77a953ae2b2fbc6767410 100644 (file)
@@ -21,7 +21,7 @@
        </PropertyGroup>
     
        <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">    
-               <DefineConstants>TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_0;WITH_SHADOWS;WITH_VKVG</DefineConstants>    
+               <DefineConstants>TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_0;WITH_SHADOWS;_WITH_VKVG</DefineConstants>    
        </PropertyGroup>
        <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
                <DefineConstants>NETSTANDARD;NETSTANDARD2_0;WITH_SHADOWS;_WITH_VKVG</DefineConstants>    
index d5ecf8f0814b875871162be82147e5f433d2e823..906931d07490466e19aff68bcc1cae38a02daf0c 100644 (file)
@@ -94,8 +94,8 @@ namespace DistanceFieldFontTest {
                        cfg.AddVertexBinding (0, 5 * sizeof (float));
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32Sfloat);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.main.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.main.frag.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Vertex, "#shaders.main.vert.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.main.frag.spv");
 
                        pipeline = new GraphicPipeline (cfg);
 
index 6ad34e92c3d7d51e8400e8f833941afac8c26ae8..701a289505290c2f0cc2c587171c5d960965fc2b 100644 (file)
@@ -1,5 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\..\addons\gltfLoader\gltfLoader.csproj" />
-  </ItemGroup>
-</Project>
+       <ItemGroup>
+               <ProjectReference Include="..\..\addons\gltfLoader\gltfLoader.csproj" />
+       </ItemGroup>
+       <ItemGroup>
+               <GLSLShader Remove="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom" />
+               <None Include="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom">
+                       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+               </None>
+       </ItemGroup>
+</Project>
\ No newline at end of file
index 6e040d8ffe860ca521b9ee16c34feb426f20d6de..7799f2c2eedd8ab8a0e96bd37f06921e4be9fcb9 100644 (file)
@@ -1,14 +1,14 @@
 // Copyright (c) 2019  Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
 //
 // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
 using System.Numerics;
 using System.Runtime.InteropServices;
 using vke;
 using vke.glTF;
 using Vulkan;
 
-namespace ModelSample
-{
+namespace ModelSample {
        class Program : VkWindow {
                static void Main (string[] args) {
 #if DEBUG
@@ -82,11 +82,16 @@ namespace ModelSample
                        cfg.AddVertexBinding<Model.Vertex> (0);
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat, VkFormat.R32g32Sfloat);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.model.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.model.frag.spv");
+                       using (shaderc.Compiler comp = new shaderc.Compiler()) {
+
+                               cfg.AddShaders (comp.CreateShaderInfo (dev, "shaders/model.vert", shaderc.ShaderKind.VertexShader));
+                               cfg.AddShaders (comp.CreateShaderInfo (dev, "shaders/model.frag", shaderc.ShaderKind.FragmentShader));
+                       }
 
                        pipeline = new GraphicPipeline (cfg);
 
+                       cfg.DisposeShaders ();
+
                        helmet = new SimpleModel (presentQueue, Utils.DataDirectory + "models/DamagedHelmet/glTF/DamagedHelmet.gltf");
 
                        dsMatrices = descriptorPool.Allocate (descLayoutMatrix);
diff --git a/samples/RayTests/DebuDrawPipeline.cs b/samples/RayTests/DebuDrawPipeline.cs
new file mode 100644 (file)
index 0000000..fef2751
--- /dev/null
@@ -0,0 +1,78 @@
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using VK;
+
+namespace CVKL {
+       public class DebugDrawPipeline : GraphicPipeline {
+               public HostBuffer Vertices;
+               uint vertexCount;
+               uint vboLength = 100 * 6 * sizeof (float);
+
+               public DebugDrawPipeline (Device dev, DescriptorSetLayout dsLayout, VkFormat colorFormat, VkSampleCountFlags samples = VkSampleCountFlags.SampleCount1) :
+                       base (new RenderPass (dev, colorFormat), "Debug draw pipeline") {
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.LineList, samples);
+                       cfg.rasterizationState.lineWidth = 1.0f;
+                       cfg.RenderPass = RenderPass;
+                       cfg.Layout = new PipelineLayout(dev, dsLayout);
+                       cfg.Layout.AddPushConstants (
+                               new VkPushConstantRange (VkShaderStageFlags.Vertex, (uint)Marshal.SizeOf<Matrix4x4> () * 2)                     
+                       );
+                       cfg.AddVertexBinding (0, 6 * sizeof(float));
+                       cfg.SetVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat);
+
+                       cfg.blendAttachments[0] = new VkPipelineColorBlendAttachmentState (true);
+
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "shaders/debug.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Fragment, "shaders/debug.frag.spv");
+
+                       layout = cfg.Layout;
+
+                       init (cfg);
+
+                       Vertices = new HostBuffer (dev, VkBufferUsageFlags.VertexBuffer, vboLength);
+                       Vertices.Map ();
+               }
+
+               public void AddLine (Vector3 start, Vector3 end, float r, float g, float b) {
+                       float[] data = {
+                               start.X, start.Y, start.Z,
+                               r, g, b,
+                               end.X, end.Y, end.Z,
+                               r, g, b
+                       };
+                       Vertices.Update (data, 12 * sizeof (float), vertexCount * 6 * sizeof (float));
+                       vertexCount+=2;
+               }
+
+               public void RecordDraw (CommandBuffer cmd, Framebuffer fb, Camera camera) {
+                       RenderPass.Begin (cmd, fb);
+                       const int ratio = 8;
+                       cmd.SetViewport (fb.Width/ratio, fb.Height/ratio, (ratio-1) * (int)fb.Width / ratio, (ratio-1) * (int)fb.Height / ratio);
+                       //cmd.SetViewport (200, 200,100,100,-10,10);//, 4 * (int)fb.Width / 5, 4 * (int)fb.Height / 5);
+                       cmd.SetScissor (fb.Width / ratio, fb.Height / ratio, (ratio-1) * (int)fb.Width / ratio, (ratio-1) * (int)fb.Height / ratio);
+                       //cmd.SetScissor (200, 200,100,100);
+
+                       Matrix4x4 ortho = Matrix4x4.CreateOrthographic (4, 4.0f / camera.AspectRatio,-1,1);
+
+                       cmd.PushConstant (layout, VkShaderStageFlags.Vertex, ortho);
+
+                       Bind (cmd);
+
+                       cmd.BindVertexBuffer (Vertices);
+                       cmd.Draw (vertexCount);
+                       RenderPass.End (cmd);
+               }
+
+               protected override void Dispose (bool disposing) {
+                       if (disposing) {
+                               Vertices.Unmap ();
+                               Vertices.Dispose ();
+                       }
+
+                       base.Dispose (disposing);
+               }
+       }
+
+}
diff --git a/samples/RayTests/EnvironmentPipeline.cs b/samples/RayTests/EnvironmentPipeline.cs
new file mode 100644 (file)
index 0000000..32f8e6a
--- /dev/null
@@ -0,0 +1,317 @@
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Vulkan;
+
+namespace vke {
+       public class EnvironmentCube : GraphicPipeline {
+
+               GPUBuffer vboSkybox;
+
+               public Image cubemap { get; private set; }
+               public Image lutBrdf { get; private set; }
+               public Image irradianceCube { get; private set; }
+               public Image prefilterCube { get; set; }
+
+               public EnvironmentCube (string cubemapPath, DescriptorSet dsSkybox, PipelineLayout plLayout, Queue staggingQ, RenderPass renderPass, PipelineCache cache = null)
+               : base (renderPass, cache, "EnvCube pipeline") {
+
+                       using (CommandPool cmdPool = new CommandPool (staggingQ.Dev, staggingQ.index)) {
+
+                               vboSkybox = new GPUBuffer<float> (staggingQ, cmdPool, VkBufferUsageFlags.VertexBuffer, box_vertices);
+
+                               cubemap = KTX.KTX.Load (staggingQ, cmdPool, cubemapPath,
+                                       VkImageUsageFlags.Sampled, VkMemoryPropertyFlags.DeviceLocal, true);
+                               cubemap.CreateView (VkImageViewType.Cube, VkImageAspectFlags.Color);
+                               cubemap.CreateSampler (VkSamplerAddressMode.ClampToEdge);
+                               cubemap.SetName ("skybox Texture");
+                               cubemap.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+
+                               GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, renderPass.Samples, false);
+                               cfg.RenderPass = renderPass;
+                               cfg.Layout = plLayout;
+                               cfg.AddVertexBinding (0, 3 * sizeof (float));
+                               cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat);
+                               cfg.AddShader (VkShaderStageFlags.Vertex, "#deferred.skybox.vert.spv");
+                               cfg.AddShader (VkShaderStageFlags.Fragment, "#deferred.skybox.frag.spv");
+                               cfg.multisampleState.rasterizationSamples = Samples;
+
+                               layout = cfg.Layout;
+
+                               init (cfg);
+
+                               generateBRDFLUT (staggingQ, cmdPool);
+                               generateCubemaps (staggingQ, cmdPool);
+                       }
+
+               }
+
+               public void RecordDraw (CommandBuffer cmd) {
+                       Bind (cmd);
+                       cmd.BindVertexBuffer (vboSkybox);
+                       cmd.Draw (36);
+               }
+
+               #region skybox
+
+               static float[] box_vertices = {
+                        1.0f, 1.0f,-1.0f,  // +X side
+                        1.0f, 1.0f, 1.0f,
+                        1.0f,-1.0f, 1.0f,
+                        1.0f,-1.0f, 1.0f,
+                        1.0f,-1.0f,-1.0f,
+                        1.0f, 1.0f,-1.0f,
+
+                       -1.0f,-1.0f,-1.0f,      // +X side
+                       -1.0f,-1.0f, 1.0f,
+                       -1.0f, 1.0f, 1.0f,
+                       -1.0f, 1.0f, 1.0f,
+                       -1.0f, 1.0f,-1.0f,
+                       -1.0f,-1.0f,-1.0f,
+
+                       -1.0f, 1.0f,-1.0f,  // +Y side
+                       -1.0f, 1.0f, 1.0f,
+                        1.0f, 1.0f, 1.0f,
+                       -1.0f, 1.0f,-1.0f,
+                        1.0f, 1.0f, 1.0f,
+                        1.0f, 1.0f,-1.0f,
+
+                       -1.0f,-1.0f,-1.0f,  // -Y side
+                        1.0f,-1.0f,-1.0f,
+                        1.0f,-1.0f, 1.0f,
+                       -1.0f,-1.0f,-1.0f,
+                        1.0f,-1.0f, 1.0f,
+                       -1.0f,-1.0f, 1.0f,
+
+                       -1.0f, 1.0f, 1.0f,  // +Z side
+                       -1.0f,-1.0f, 1.0f,
+                        1.0f, 1.0f, 1.0f,
+                       -1.0f,-1.0f, 1.0f,
+                        1.0f,-1.0f, 1.0f,
+                        1.0f, 1.0f, 1.0f,
+
+                       -1.0f,-1.0f,-1.0f,  // -Z side
+                        1.0f, 1.0f,-1.0f,
+                        1.0f,-1.0f,-1.0f,
+                       -1.0f,-1.0f,-1.0f,
+                       -1.0f, 1.0f,-1.0f,
+                        1.0f, 1.0f,-1.0f,
+
+               };
+               #endregion
+
+               void generateBRDFLUT (Queue staggingQ, CommandPool cmdPool) {
+                       const VkFormat format = VkFormat.R16g16Sfloat;
+                       const int dim = 512;
+
+                       lutBrdf = new Image (Dev, format, VkImageUsageFlags.ColorAttachment | VkImageUsageFlags.Sampled,
+                               VkMemoryPropertyFlags.DeviceLocal, dim, dim);
+                       lutBrdf.SetName ("lutBrdf");
+
+                       lutBrdf.CreateView ();
+                       lutBrdf.CreateSampler (VkSamplerAddressMode.ClampToEdge);
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, VkSampleCountFlags.SampleCount1, false);
+
+                       cfg.Layout = new PipelineLayout (Dev, new DescriptorSetLayout (Dev));
+                       cfg.RenderPass = new RenderPass (Dev);
+                       cfg.RenderPass.AddAttachment (format, VkImageLayout.ShaderReadOnlyOptimal);
+                       cfg.RenderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0, 0, 0) });
+                       cfg.RenderPass.AddSubpass (new SubPass (VkImageLayout.ColorAttachmentOptimal));
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "#deferred.genbrdflut.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Fragment, "#deferred.genbrdflut.frag.spv");
+
+                       using (GraphicPipeline pl = new GraphicPipeline (cfg)) {
+                               using (FrameBuffer fb = new FrameBuffer (cfg.RenderPass, dim, dim, lutBrdf)) {
+                                       CommandBuffer cmd = cmdPool.AllocateCommandBuffer ();
+                                       cmd.Start (VkCommandBufferUsageFlags.OneTimeSubmit);
+                                       pl.RenderPass.Begin (cmd, fb);
+                                       cmd.SetViewport (dim, dim);
+                                       cmd.SetScissor (dim, dim);
+                                       pl.Bind (cmd);
+                                       cmd.Draw (3, 1, 0, 0);
+                                       pl.RenderPass.End (cmd);
+                                       cmd.End ();
+
+                                       staggingQ.Submit (cmd);
+                                       staggingQ.WaitIdle ();
+
+                                       cmd.Free ();
+                               }
+                       }
+                       lutBrdf.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+               }
+
+               public enum CBTarget { IRRADIANCE = 0, PREFILTEREDENV = 1 };
+
+               public Image generateCubeMap (Queue staggingQ, CommandPool cmdPool, CBTarget target) {
+                       const float deltaPhi = (2.0f * (float)Math.PI) / 180.0f;
+                       const float deltaTheta = (0.5f * (float)Math.PI) / 64.0f;
+
+                       VkFormat format = VkFormat.R32g32b32a32Sfloat;
+                       uint dim = 64;
+
+                       if (target == CBTarget.PREFILTEREDENV) {
+                               format = VkFormat.R16g16b16a16Sfloat;
+                               dim = 512;
+                       }
+
+                       uint numMips = (uint)Math.Floor (Math.Log (dim, 2)) + 1;
+
+                       Image imgFbOffscreen = new Image (Dev, format, VkImageUsageFlags.TransferSrc | VkImageUsageFlags.ColorAttachment,
+                               VkMemoryPropertyFlags.DeviceLocal, dim, dim);
+                       imgFbOffscreen.SetName ("offscreenfb");
+                       imgFbOffscreen.CreateView ();
+
+                       Image cmap = new Image (Dev, format, VkImageUsageFlags.TransferDst | VkImageUsageFlags.Sampled,
+                               VkMemoryPropertyFlags.DeviceLocal, dim, dim, VkImageType.Image2D, VkSampleCountFlags.SampleCount1, VkImageTiling.Optimal,
+                               numMips, 6, 1, VkImageCreateFlags.CubeCompatible);
+                       if (target == CBTarget.PREFILTEREDENV)
+                               cmap.SetName ("prefilterenvmap");
+                       else
+                               cmap.SetName ("irradianceCube");
+                       cmap.CreateView (VkImageViewType.Cube, VkImageAspectFlags.Color, 6, 0);
+                       cmap.CreateSampler (VkSamplerAddressMode.ClampToEdge);
+
+                       DescriptorPool dsPool = new DescriptorPool (Dev, 2, new VkDescriptorPoolSize (VkDescriptorType.CombinedImageSampler));
+
+                       DescriptorSetLayout dsLayout = new DescriptorSetLayout (Dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler));
+
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, VkSampleCountFlags.SampleCount1, false);
+                       cfg.Layout = new PipelineLayout (Dev, dsLayout);
+                       cfg.Layout.AddPushConstants (
+                               new VkPushConstantRange (VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, (uint)Marshal.SizeOf<Matrix4x4> () + 8));
+
+                       cfg.RenderPass = new RenderPass (Dev);
+                       cfg.RenderPass.AddAttachment (format, VkImageLayout.ColorAttachmentOptimal);
+                       cfg.RenderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0, 0, 0) });
+                       cfg.RenderPass.AddSubpass (new SubPass (VkImageLayout.ColorAttachmentOptimal));
+
+                       cfg.AddVertexBinding (0, 3 * sizeof (float));
+                       cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat);
+
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "#deferred.filtercube.vert.spv");
+                       if (target == CBTarget.PREFILTEREDENV)
+                               cfg.AddShader (VkShaderStageFlags.Fragment, "#deferred.prefilterenvmap.frag.spv");
+                       else
+                               cfg.AddShader (VkShaderStageFlags.Fragment, "#deferred.irradiancecube.frag.spv");
+
+                       Matrix4x4[] matrices = {
+                               // POSITIVE_X
+                               Matrix4x4.CreateRotationX(Utils.DegreesToRadians(180)) * Matrix4x4.CreateRotationY(Utils.DegreesToRadians(90)),
+                               // NEGATIVE_X
+                               Matrix4x4.CreateRotationX(Utils.DegreesToRadians(180)) * Matrix4x4.CreateRotationY(Utils.DegreesToRadians(-90)),
+                               // POSITIVE_Y
+                               Matrix4x4.CreateRotationX(Utils.DegreesToRadians(-90)),
+                               // NEGATIVE_Y
+                               Matrix4x4.CreateRotationX(Utils.DegreesToRadians(90)),
+                               // POSITIVE_Z
+                               Matrix4x4.CreateRotationX(Utils.DegreesToRadians(180)),
+                               // NEGATIVE_Z
+                               Matrix4x4.CreateRotationZ(Utils.DegreesToRadians(180))
+                       };
+
+                       VkImageSubresourceRange subRes = new VkImageSubresourceRange (VkImageAspectFlags.Color, 0, numMips, 0, 6);
+
+                       using (GraphicPipeline pl = new GraphicPipeline (cfg)) {
+
+                               DescriptorSet dset = dsPool.Allocate (dsLayout);
+                               DescriptorSetWrites dsUpdate = new DescriptorSetWrites (dsLayout);
+                               dsUpdate.Write (Dev, dset, cubemap.Descriptor);
+                               Dev.WaitIdle ();
+
+                               using (FrameBuffer fb = new FrameBuffer (pl.RenderPass, dim, dim, imgFbOffscreen)) {
+                                       CommandBuffer cmd = cmdPool.AllocateCommandBuffer ();
+                                       cmd.Start (VkCommandBufferUsageFlags.OneTimeSubmit);
+
+                                       cmap.SetLayout (cmd, VkImageLayout.Undefined, VkImageLayout.TransferDstOptimal, subRes);
+
+                                       float roughness = 0;
+
+                                       cmd.SetScissor (dim, dim);
+                                       cmd.SetViewport ((float)(dim), (float)dim);
+
+                                       for (int m = 0; m < numMips; m++) {
+                                               roughness = (float)m / ((float)numMips - 1f);
+
+                                               for (int f = 0; f < 6; f++) {
+                                                       pl.RenderPass.Begin (cmd, fb);
+
+                                                       pl.Bind (cmd);
+
+                                                       float viewPortSize = (float)Math.Pow (0.5, m) * dim;
+                                                       cmd.SetViewport (viewPortSize, viewPortSize);
+                                                       cmd.PushConstant (pl.Layout, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment,
+                                                               matrices[f] * Matrix4x4.CreatePerspectiveFieldOfView (Utils.DegreesToRadians (90), 1f, 0.1f, 512f));
+                                                       if (target == CBTarget.IRRADIANCE) {
+                                                               cmd.PushConstant (pl.Layout, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, deltaPhi, (uint)Marshal.SizeOf<Matrix4x4> ());
+                                                               cmd.PushConstant (pl.Layout, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, deltaTheta, (uint)Marshal.SizeOf<Matrix4x4> () + 4);
+                                                       } else {
+                                                               cmd.PushConstant (pl.Layout, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, roughness, (uint)Marshal.SizeOf<Matrix4x4> ());
+                                                               cmd.PushConstant (pl.Layout, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, 64u, (uint)Marshal.SizeOf<Matrix4x4> () + 4);
+                                                       }
+
+                                                       cmd.BindDescriptorSet (pl.Layout, dset);
+                                                       cmd.BindVertexBuffer (vboSkybox);
+                                                       cmd.Draw (36);
+
+                                                       pl.RenderPass.End (cmd);
+
+                                                       imgFbOffscreen.SetLayout (cmd, VkImageAspectFlags.Color,
+                                                               VkImageLayout.ColorAttachmentOptimal, VkImageLayout.TransferSrcOptimal);
+
+                                                       VkImageCopy region = new VkImageCopy ();
+                                                       region.srcSubresource = new VkImageSubresourceLayers (VkImageAspectFlags.Color, 1);
+                                                       region.dstSubresource = new VkImageSubresourceLayers (VkImageAspectFlags.Color, 1, (uint)m, (uint)f);
+                                                       region.extent = new VkExtent3D { width = (uint)viewPortSize, height = (uint)viewPortSize, depth = 1 };
+
+                                                       Vk.vkCmdCopyImage (cmd.Handle,
+                                                               imgFbOffscreen.Handle, VkImageLayout.TransferSrcOptimal,
+                                                               cmap.Handle, VkImageLayout.TransferDstOptimal,
+                                                               1, region.Pin ());
+                                                       region.Unpin ();
+
+                                                       imgFbOffscreen.SetLayout (cmd, VkImageAspectFlags.Color,
+                                                               VkImageLayout.TransferSrcOptimal, VkImageLayout.ColorAttachmentOptimal);
+
+                                               }
+                                       }
+
+                                       cmap.SetLayout (cmd, VkImageLayout.TransferDstOptimal, VkImageLayout.ShaderReadOnlyOptimal, subRes);
+
+                                       cmd.End ();
+
+                                       staggingQ.Submit (cmd);
+                                       staggingQ.WaitIdle ();
+
+                                       cmd.Free ();
+                               }
+                       }
+                       cmap.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+
+                       dsLayout.Dispose ();
+                       imgFbOffscreen.Dispose ();
+                       dsPool.Dispose ();
+
+                       return cmap;
+               }
+
+               void generateCubemaps (Queue staggingQ, CommandPool cmdPool) {
+                       irradianceCube = generateCubeMap (staggingQ, cmdPool, CBTarget.IRRADIANCE);
+                       prefilterCube = generateCubeMap (staggingQ, cmdPool, CBTarget.PREFILTEREDENV);
+               }
+
+               protected override void Dispose (bool disposing) {
+                       vboSkybox.Dispose ();
+                       cubemap.Dispose ();
+                       lutBrdf.Dispose ();
+                       irradianceCube.Dispose ();
+                       prefilterCube.Dispose ();
+
+                       base.Dispose (disposing);
+               }
+       }
+
+}
diff --git a/samples/RayTests/RayTests.csproj b/samples/RayTests/RayTests.csproj
new file mode 100644 (file)
index 0000000..ba6ec6a
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+       <PropertyGroup>
+               <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+               <!--    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>     -->
+       </PropertyGroup>
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+               <WarningLevel>4</WarningLevel>
+               <DebugType>full</DebugType>
+               <Optimize>false</Optimize>
+               <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+               <DefineConstants>TRACE;MEMORY_POOLS;_WITH_VKVG;DEBUG;NETFRAMEWORK;NET472</DefineConstants>
+       </PropertyGroup>
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugCrow|AnyCPU' ">
+               <DefineConstants>TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_0;MEMORY_POOLS;WITH_SHADOWS;_WITH_VKVG</DefineConstants>
+       </PropertyGroup>
+       <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugCrow|AnyCPU' ">
+               <Compile Include="main-crow.cs" />
+               <EmbeddedResource Include="ui\**\*.*">
+                       <LogicalName>deferred.%(Filename)%(Extension)</LogicalName>
+               </EmbeddedResource>
+       </ItemGroup>
+       <ItemGroup Condition="$(Configuration) != 'DebugCrow' ">
+               <Compile Include="main.cs" />
+       </ItemGroup>
+       <ItemGroup>
+               <!--    <PackageReference Include="Crow.VK" Version="0.9.0-beta" />-->
+       </ItemGroup>
+       <ItemGroup>
+               <Folder Include="shaders\" />
+       </ItemGroup>
+       <ItemGroup>
+               <ProjectReference Include="..\..\addons\gltfLoader\gltfLoader.csproj" />
+               <ProjectReference Include="..\..\addons\EnvironmentPipeline\EnvironmentPipeline.csproj" />
+       </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/RayTests/main-crow.cs b/samples/RayTests/main-crow.cs
new file mode 100644 (file)
index 0000000..20f6566
--- /dev/null
@@ -0,0 +1,403 @@
+using System;
+using System.Numerics;
+using Glfw;
+using Vulkan;
+using vke;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace deferred {
+       class Program : Crow.CrowWin {
+               static void Main (string[] args) {
+#if DEBUG
+                       Instance.VALIDATION = true;
+                       Instance.DEBUG_UTILS = true;
+                       Instance.RENDER_DOC_CAPTURE = false;
+#endif
+                       DeferredPbrRenderer.TEXTURE_ARRAY = true;
+                       DeferredPbrRenderer.NUM_SAMPLES = VkSampleCountFlags.SampleCount1;
+                       DeferredPbrRenderer.HDR_FORMAT = VkFormat.R32g32b32a32Sfloat;
+                       DeferredPbrRenderer.MRT_FORMAT = VkFormat.R16g16b16a16Sfloat;
+
+                       PbrModelTexArray.TEXTURE_DIM = 1024;
+
+                       using (Program vke = new Program ()) {
+                               vke.Run ();                     
+                       }
+               }
+
+               #region crow ui
+               public Crow.Command CMDViewScenes, CMDViewEditor, CMDViewDebug, CMDViewMaterials;
+               void init_crow_commands () {
+                       CMDViewScenes = new Crow.Command (new Action (() => loadWindow ("#deferred.main.crow", this))) { Caption = "Lighting", Icon = new Crow.SvgPicture ("#deferred.crow.svg"), CanExecute = true };
+                       CMDViewEditor = new Crow.Command (new Action (() => loadWindow ("#deferred.scenes.crow", this))) { Caption = "Scenes", Icon = new Crow.SvgPicture ("#deferred.crow.svg"), CanExecute = true };
+                       CMDViewDebug = new Crow.Command (new Action (() => loadWindow ("#deferred.debug.crow", this))) { Caption = "Debug", Icon = new Crow.SvgPicture ("#deferred.crow.svg"), CanExecute = true };
+                       CMDViewMaterials = new Crow.Command (new Action (() => loadWindow ("#deferred.materials.crow", this))) { Caption = "Materials", Icon = new Crow.SvgPicture ("#deferred.crow.svg"), CanExecute = true };
+               }
+
+               public DeferredPbrRenderer.DebugView CurrentDebugView {
+                       get { return renderer.currentDebugView; }
+                       set {
+                               if (value == renderer.currentDebugView)
+                                       return;
+                               lock(crow.UpdateMutex)
+                                       renderer.currentDebugView = value;
+                               rebuildBuffers = true;
+                               NotifyValueChanged ("CurrentDebugView", renderer.currentDebugView);
+                       }
+               }
+
+               public float Gamma {
+                       get { return renderer.matrices.gamma; }
+                       set {
+                               if (value == renderer.matrices.gamma)
+                                       return;
+                               renderer.matrices.gamma = value;
+                               NotifyValueChanged ("Gamma", value);
+                               updateViewRequested = true;
+                       }
+               }
+               public float Exposure {
+                       get { return renderer.matrices.exposure; }
+                       set {
+                               if (value == renderer.matrices.exposure)
+                                       return;
+                               renderer.matrices.exposure = value;
+                               NotifyValueChanged ("Exposure", value);
+                               updateViewRequested = true;
+                       }
+               }
+               public float LightStrength {
+                       get { return renderer.lights[renderer.lightNumDebug].color.X; }
+                       set {
+                               if (value == renderer.lights[renderer.lightNumDebug].color.X)
+                                       return;
+                               renderer.lights[renderer.lightNumDebug].color = new Vector4(value);
+                               NotifyValueChanged ("LightStrength", value);
+                               renderer.uboLights.Update (renderer.lights);
+                       }
+               }
+               public List<DeferredPbrRenderer.Light> Lights => renderer.lights.ToList ();
+               public List<Model.Scene> Scenes => renderer.model.Scenes;
+               #endregion
+
+               public override string[] EnabledDeviceExtensions => new string[] {
+                       Ext.D.VK_KHR_swapchain,
+                       Ext.D.VK_EXT_debug_marker
+               };
+
+               protected override void configureEnabledFeatures (VkPhysicalDeviceFeatures available_features, ref VkPhysicalDeviceFeatures features) {
+                       base.configureEnabledFeatures (available_features, ref features);
+
+                       features.samplerAnisotropy = available_features.samplerAnisotropy;
+                       features.sampleRateShading = available_features.sampleRateShading;
+                       features.geometryShader = available_features.geometryShader;
+                       features.pipelineStatisticsQuery = true;
+
+                       if (available_features.textureCompressionETC2) {
+                               features.textureCompressionETC2 = true;
+                               Image.DefaultTextureFormat = VkFormat.Etc2R8g8b8a8UnormBlock;
+                       }else if (available_features.textureCompressionBC) {
+                               //features.textureCompressionBC = true;
+                               //Image.DefaultTextureFormat = VkFormat.Bc3UnormBlock;
+                       }
+
+
+               }
+
+               protected override void createQueues () {
+                       base.createQueues ();
+                       transferQ = new Queue (dev, VkQueueFlags.Transfer);
+               }
+
+               string[] cubemapPathes = {
+                       Utils.DataDirectory + "textures/papermill.ktx",
+                       Utils.DataDirectory + "textures/cubemap_yokohama_bc3_unorm.ktx",
+                       Utils.DataDirectory + "textures/gcanyon_cube.ktx",
+                       Utils.DataDirectory + "textures/pisa_cube.ktx",
+                       Utils.DataDirectory + "textures/uffizi_cube.ktx",
+               };
+               string[] modelPathes = {
+                               //"/mnt/devel/gts/vkChess.net/data/models/chess.glb",
+                               //"/home/jp/gltf/jaguar/scene.gltf",
+                               Utils.DataDirectory + "models/DamagedHelmet/glTF/DamagedHelmet.gltf",
+                               Utils.DataDirectory + "models/shadow.glb",
+                               Utils.DataDirectory + "models/Hubble.glb",
+                               Utils.DataDirectory + "models/MER_static.glb",
+                               Utils.DataDirectory + "models/ISS_stationary.glb",
+                       };
+
+               int curModelIndex = 0;
+               bool reloadModel;
+
+               Queue transferQ;
+               DeferredPbrRenderer renderer;
+               PipelineStatisticsQueryPool statPool;
+               TimestampQueryPool timestampQPool;
+               ulong[] results;
+
+               DebugReport dbgRepport;
+
+               Program () : base() {
+
+                       if (Instance.DEBUG_UTILS)
+                               dbgRepport = new DebugReport (instance,
+                                       VkDebugReportFlagsEXT.ErrorEXT
+                                       | VkDebugReportFlagsEXT.DebugEXT
+                                       | VkDebugReportFlagsEXT.WarningEXT
+                                       | VkDebugReportFlagsEXT.PerformanceWarningEXT
+                               );
+
+                       camera = new Camera (Utils.DegreesToRadians (45f), 1f, 0.1f, 16f);
+                       camera.SetPosition (0, 0, 2);
+
+                       renderer = new DeferredPbrRenderer (dev, swapChain, presentQueue, cubemapPathes[2], camera.NearPlane, camera.FarPlane);
+                       renderer.LoadModel (transferQ, modelPathes[curModelIndex]);
+                       camera.Model = Matrix4x4.CreateScale (1f / Math.Max (Math.Max (renderer.modelAABB.Width, renderer.modelAABB.Height), renderer.modelAABB.Depth));
+
+                       statPool = new PipelineStatisticsQueryPool (dev,
+                               VkQueryPipelineStatisticFlags.InputAssemblyVertices |
+                               VkQueryPipelineStatisticFlags.InputAssemblyPrimitives |
+                               VkQueryPipelineStatisticFlags.ClippingInvocations |
+                               VkQueryPipelineStatisticFlags.ClippingPrimitives |
+                               VkQueryPipelineStatisticFlags.FragmentShaderInvocations);
+
+                       timestampQPool = new TimestampQueryPool (dev);
+
+                       init_crow_commands ();
+
+                       crow.Load ("#deferred.menu.crow").DataSource = this;
+
+               }
+
+               protected override void recordDraw (CommandBuffer cmd, int imageIndex) {
+                       statPool.Begin (cmd);
+                       renderer.buildCommandBuffers (cmd, imageIndex);
+                       statPool.End (cmd);
+               }
+
+               public override void UpdateView () {
+                       renderer.UpdateView (camera);
+                       updateViewRequested = false;
+#if WITH_SHADOWS
+                       if (renderer.shadowMapRenderer.updateShadowMap)
+                               renderer.shadowMapRenderer.update_shadow_map (cmdPool);
+#endif
+               }
+
+               int frameCount = 0;
+               public override void Update () {
+                       if (reloadModel) {
+                               renderer.LoadModel (transferQ, modelPathes[curModelIndex]);
+                               reloadModel = false;
+                               camera.Model = Matrix4x4.CreateScale (1f / Math.Max (Math.Max (renderer.modelAABB.Width, renderer.modelAABB.Height), renderer.modelAABB.Depth));
+                               updateViewRequested = true;
+                               rebuildBuffers = true;
+#if WITH_SHADOWS
+                               renderer.shadowMapRenderer.updateShadowMap = true;
+#endif
+                       }
+
+                       base.Update ();
+
+                       if (++frameCount > 20) {
+                               NotifyValueChanged ("fps", fps);
+                               frameCount = 0;
+                       }
+
+                       results = statPool.GetResults ();
+               }
+               protected override void OnResize () {           
+                       renderer.Resize ();
+                       base.OnResize ();
+               }
+
+               #region Mouse and keyboard
+               protected override void onMouseMove (double xPos, double yPos) {
+                       if (crow.ProcessMouseMove ((int)xPos, (int)yPos))
+                               return;
+
+                       double diffX = lastMouseX - xPos;
+                       double diffY = lastMouseY - yPos;
+                       if (MouseButton[0]) {
+                               camera.Rotate ((float)-diffX, (float)-diffY);
+                       } else if (MouseButton[1]) {
+                               camera.SetZoom ((float)diffY);
+                       } else
+                               return;
+
+                       updateViewRequested = true;
+               }
+               protected override void onMouseButtonDown (Glfw.MouseButton button) {
+                       if (crow.ProcessMouseButtonDown ((Crow.MouseButton)button))
+                               return;
+                       base.onMouseButtonDown (button);
+               }
+               protected override void onMouseButtonUp (Glfw.MouseButton button) {
+                       if (crow.ProcessMouseButtonUp ((Crow.MouseButton)button))
+                               return;
+                       base.onMouseButtonUp (button);
+               }
+               protected override void onKeyDown (Key key, int scanCode, Modifier modifiers) {
+                       if (crow.ProcessKeyDown ((Crow.Key)key))
+                               return;
+                       switch (key) {
+                               case Key.F:
+                                       if (modifiers.HasFlag (Modifier.Shift)) {
+                                               renderer.debugFace--;
+                                               if (renderer.debugFace < 0)
+                                                       renderer.debugFace = 5;
+                                       } else {
+                                               renderer.debugFace++;
+                                               if (renderer.debugFace >= 5)
+                                                       renderer.debugFace = 0;
+                                       }
+                                       rebuildBuffers = true;
+                                       break;
+                               case Key.M:
+                                       if (modifiers.HasFlag (Modifier.Shift)) {
+                                               renderer.debugMip--;
+                                               if (renderer.debugMip < 0)
+                                                       renderer.debugMip = (int)renderer.envCube.prefilterCube.CreateInfo.mipLevels - 1;
+                                       } else {
+                                               renderer.debugMip++;
+                                               if (renderer.debugMip >= renderer.envCube.prefilterCube.CreateInfo.mipLevels)
+                                                       renderer.debugMip = 0;
+                                       }
+                                       rebuildBuffers = true;
+                                       break;
+                               case Key.L:
+                                       if (modifiers.HasFlag (Modifier.Shift)) {
+                                               renderer.lightNumDebug--;
+                                               if (renderer.lightNumDebug < 0)
+                                                       renderer.lightNumDebug = (int)renderer.lights.Length - 1;
+                                       } else {
+                                               renderer.lightNumDebug++;
+                                               if (renderer.lightNumDebug >= renderer.lights.Length)
+                                                       renderer.lightNumDebug = 0;
+                                       }
+                                       rebuildBuffers = true;
+                                       break;
+                               case Key.Keypad0:
+                               case Key.Keypad1:
+                               case Key.Keypad2:
+                               case Key.Keypad3:
+                               case Key.Keypad4:
+                               case Key.Keypad5:
+                               case Key.Keypad6:
+                               case Key.Keypad7:
+                               case Key.Keypad8:
+                               case Key.Keypad9:
+                                       renderer.currentDebugView = (DeferredPbrRenderer.DebugView)(int)key-320;
+                                       rebuildBuffers = true;
+                                       break;
+                               case Key.KeypadDivide:
+                                       renderer.currentDebugView = DeferredPbrRenderer.DebugView.irradiance;
+                                       rebuildBuffers = true;
+                                       break;
+                               case Key.S:
+                                       if (modifiers.HasFlag (Modifier.Control)) {
+                                               renderer.pipelineCache.Save ();
+                                               Console.WriteLine ($"Pipeline Cache saved.");
+                                       } else {
+                                               renderer.currentDebugView = DeferredPbrRenderer.DebugView.shadowMap;
+                                               rebuildBuffers = true; 
+                                       }
+                                       break;
+                               case Key.Up:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               renderer.MoveLight(-Vector4.UnitZ);
+                                       else
+                                               camera.Move (0, 0, 1);
+                                       break;
+                               case Key.Down:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               renderer.MoveLight (Vector4.UnitZ);
+                                       else
+                                               camera.Move (0, 0, -1);
+                                       break;
+                               case Key.Left:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               renderer.MoveLight (-Vector4.UnitX);
+                                       else
+                                               camera.Move (1, 0, 0);
+                                       break;
+                               case Key.Right:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               renderer.MoveLight (Vector4.UnitX);
+                                       else
+                                               camera.Move (-1, 0, 0);
+                                       break;
+                               case Key.PageUp:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               renderer.MoveLight (Vector4.UnitY);
+                                       else
+                                               camera.Move (0, 1, 0);
+                                       break;
+                               case Key.PageDown:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               renderer.MoveLight (-Vector4.UnitY);
+                                       else
+                                               camera.Move (0, -1, 0);
+                                       break;
+                               case Key.F2:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               renderer.matrices.exposure -= 0.3f;
+                                       else
+                                               renderer.matrices.exposure += 0.3f;
+                                       break;
+                               case Key.F3:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               renderer.matrices.gamma -= 0.1f;
+                                       else
+                                               renderer.matrices.gamma += 0.1f;
+                                       break;
+                               case Key.F4:
+                                       if (camera.Type == Camera.CamType.FirstPerson)
+                                               camera.Type = Camera.CamType.LookAt;
+                                       else
+                                               camera.Type = Camera.CamType.FirstPerson;
+                                       Console.WriteLine ($"camera type = {camera.Type}");
+                                       break;
+                               case Key.KeypadAdd:
+                                       curModelIndex++;
+                                       if (curModelIndex >= modelPathes.Length)
+                                               curModelIndex = 0;
+                                       reloadModel = true;
+                                       break;
+                               case Key.KeypadSubtract:
+                                       curModelIndex--;
+                                       if (curModelIndex < 0)
+                                               curModelIndex = modelPathes.Length -1;
+                                       reloadModel = true;
+                                       break;
+                               default:
+                                       base.onKeyDown (key, scanCode, modifiers);
+                                       return;
+                       }
+                       updateViewRequested = true;
+               }
+               protected override void onKeyUp (Key key, int scanCode, Modifier modifiers) {
+                       if (crow.ProcessKeyUp ((Crow.Key)key))
+                               return;
+               }
+               protected override void onChar (CodePoint cp) {
+                       if (crow.ProcessKeyPress (cp.ToChar ()))
+                               return;
+               }
+               #endregion
+
+               protected override void Dispose (bool disposing) {
+                       if (disposing) {
+                               if (!isDisposed) {
+                                       renderer.Dispose ();
+                                       statPool.Dispose ();
+                                       timestampQPool.Dispose ();
+                                       dbgRepport?.Dispose ();
+                               }
+                       }
+
+                       base.Dispose (disposing);
+               }
+       }
+}
diff --git a/samples/RayTests/main.cs b/samples/RayTests/main.cs
new file mode 100644 (file)
index 0000000..e3c687a
--- /dev/null
@@ -0,0 +1,633 @@
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using vke;
+using vke.glTF;
+using Glfw;
+using Vulkan;
+using vke.Environment;
+
+namespace deferred {
+       class Deferred : VkWindow {
+               static VkSampleCountFlags NUM_SAMPLES = VkSampleCountFlags.SampleCount4;
+               static VkFormat HDR_FORMAT = VkFormat.R16g16b16a16Sfloat;
+               static VkFormat MRT_FORMAT = VkFormat.R16g16b16a16Sfloat;
+               static int MAX_MATERIAL_COUNT = 4;
+
+
+               static void Main (string[] args) {
+#if DEBUG
+                       Instance.VALIDATION = true;
+                       //Instance.RENDER_DOC_CAPTURE = true;
+#endif
+                       SwapChain.PREFERED_FORMAT = VkFormat.B8g8r8a8Srgb;
+                       PbrModelTexArray.TEXTURE_DIM = 1024;
+
+                       using (Deferred vke = new Deferred ()) {
+                               vke.Run ();
+                       }
+               }
+
+               public override string[] EnabledInstanceExtensions => new string[] {
+                       Ext.I.VK_EXT_debug_utils,
+               };
+
+               public override string[] EnabledDeviceExtensions => new string[] {
+                       Ext.D.VK_KHR_swapchain,
+               };
+
+               protected override void configureEnabledFeatures (VkPhysicalDeviceFeatures available_features, ref VkPhysicalDeviceFeatures enabled_features) {
+                       base.configureEnabledFeatures (available_features, ref enabled_features);
+
+                       enabled_features.samplerAnisotropy = available_features.samplerAnisotropy;
+                       enabled_features.sampleRateShading = available_features.sampleRateShading;
+                       enabled_features.geometryShader = available_features.geometryShader;
+
+                       enabled_features.textureCompressionBC = available_features.textureCompressionBC;
+               }
+
+               protected override void createQueues () {
+                       base.createQueues ();
+                       transferQ = new Queue (dev, VkQueueFlags.Transfer);
+                       computeQ = new Queue (dev, VkQueueFlags.Compute);
+               }
+               string[] cubemapPathes = {
+                       Utils.DataDirectory + "textures/papermill.ktx",
+                       Utils.DataDirectory + "textures/cubemap_yokohama_bc3_unorm.ktx",
+                       Utils.DataDirectory + "textures/gcanyon_cube.ktx",
+                       Utils.DataDirectory + "textures/pisa_cube.ktx",
+                       Utils.DataDirectory + "textures/uffizi_cube.ktx",
+               };
+               string[] modelPathes = {
+                               "/mnt/devel/vkPinball/data/models/pinball.gltf",
+                               Utils.DataDirectory + "models/DamagedHelmet/glTF/DamagedHelmet.gltf",
+                               Utils.DataDirectory + "models/shadow.glb",
+                               Utils.DataDirectory + "models/Hubble.glb",
+                               Utils.DataDirectory + "models/MER_static.glb",
+                               Utils.DataDirectory + "models/ISS_stationary.glb",
+                       };
+
+               public enum DebugView {
+                       none,
+                       color,
+                       normal,
+                       pos,
+                       occlusion,
+                       emissive,
+                       metallic,
+                       roughness,
+                       depth,
+                       prefill,
+                       irradiance,
+                       shadowMap
+               }
+               DebugView currentDebugView = DebugView.none;
+               int lightNumDebug = 0;
+               int debugMip = 0;
+               int debugFace = 0;
+
+               const float lightMoveSpeed = 0.1f;
+               float exposure = 2.0f;
+               float gamma = 1.2f;
+
+               public struct Matrices {
+                       public Matrix4x4 projection;
+                       public Matrix4x4 model;
+                       public Matrix4x4 view;
+                       public Vector4 camPos;
+                       public float prefilteredCubeMipLevels;
+                       public float scaleIBLAmbient;
+               }
+               public struct Light {
+                       public Vector4 position;
+                       public Vector4 color;
+                       public Matrix4x4 mvp;
+               }
+
+               public Matrices matrices = new Matrices {
+                       scaleIBLAmbient = 0.5f,
+               };
+
+               public Light [] lights = {
+                       new Light {
+                               position = new Vector4(2.5f,5.5f,2,0f),
+                               color = new Vector4(1,1.0f,1.0f,1)
+                       },
+                       /*new Light {
+                               position = new Vector4(-2.5f,5.5f,2,0f),
+                               color = new Vector4(0.8f,0.8f,1,1)
+                       }*/
+               };
+
+               int curModelIndex = 0;
+               bool reloadModel;
+               bool rebuildBuffers;
+
+               vke.DebugUtils.Messenger dbgmsg;
+               Queue transferQ, computeQ;
+               PipelineCache pipelineCache;
+
+
+               GraphicPipeline plGBuff, plLighting;
+
+               FrameBuffers fbsMain;
+
+               RenderPass rpGBuff;
+               FrameBuffer fbGBuff;
+               Image gbColorRough, gbEmitMetal, gbN_AO, gbPos;
+
+
+               DescriptorPool descriptorPool;
+               DescriptorSetLayout dslMain, dslMaterial, dslLighting;
+               DescriptorSet dsMain, dsMaterial, dsLighting;
+
+               HostBuffer<Light> uboLights;
+               HostBuffer uboMatrices;
+
+               EnvironmentCube envCube;
+               PbrModel model;
+               BoundingBox modelAABB;
+
+
+               Deferred () : base("deferred") {
+                       dbgmsg = new vke.DebugUtils.Messenger (instance, VkDebugUtilsMessageTypeFlagsEXT.PerformanceEXT | VkDebugUtilsMessageTypeFlagsEXT.ValidationEXT | VkDebugUtilsMessageTypeFlagsEXT.GeneralEXT,
+                               VkDebugUtilsMessageSeverityFlagsEXT.InfoEXT |
+                               VkDebugUtilsMessageSeverityFlagsEXT.WarningEXT | VkDebugUtilsMessageSeverityFlagsEXT.ErrorEXT | VkDebugUtilsMessageSeverityFlagsEXT.VerboseEXT);
+
+                       //pipelineCache = new PipelineCache (dev);
+
+                       camera = new Camera (Utils.DegreesToRadians (45f), 1f, 0.1f, 16f);
+                       camera.SetPosition (0, -0.1f, -1);
+
+                       init ();
+
+                       LoadModel (transferQ, modelPathes [curModelIndex]);
+
+                       //dev.WaitIdle ();
+               }
+
+
+               void LoadModel (Queue transferQ, string path)
+               {
+                       dev.WaitIdle ();
+                       model?.Dispose ();
+
+                       PbrModelTexArray mod = new PbrModelTexArray (transferQ, path);
+                       if (mod.texArray != null) {
+                               DescriptorSetWrites uboUpdate = new DescriptorSetWrites (dsMaterial, dslMaterial);
+                               uboUpdate.Write (dev, mod.materialUBO.Descriptor, mod.texArray.Descriptor);
+                       }
+                       model = mod;
+
+                       modelAABB = model.DefaultScene.AABB;
+
+                       camera.Model = Matrix4x4.CreateScale (1f / Math.Max (Math.Max (modelAABB.Width, modelAABB.Height), modelAABB.Depth));
+
+                       reloadModel = false;
+               }
+
+
+               void create_gbuff_pipeline ()
+               {
+                       rpGBuff = new RenderPass (dev, NUM_SAMPLES);
+                       rpGBuff.AddAttachment (dev.GetSuitableDepthFormat (), VkImageLayout.DepthStencilAttachmentOptimal, NUM_SAMPLES);
+                       rpGBuff.AddAttachment (VkFormat.R8g8b8a8Unorm, VkImageLayout.ShaderReadOnlyOptimal, NUM_SAMPLES, VkAttachmentLoadOp.Clear, VkAttachmentStoreOp.Store, VkImageLayout.ShaderReadOnlyOptimal);//GBuff0 (color + roughness) and final color before resolve
+                       rpGBuff.AddAttachment (VkFormat.R8g8b8a8Unorm, VkImageLayout.ShaderReadOnlyOptimal, NUM_SAMPLES, VkAttachmentLoadOp.Clear, VkAttachmentStoreOp.Store, VkImageLayout.ShaderReadOnlyOptimal);//GBuff1 (emit + metal)
+                       rpGBuff.AddAttachment (MRT_FORMAT, VkImageLayout.ShaderReadOnlyOptimal, NUM_SAMPLES, VkAttachmentLoadOp.Clear, VkAttachmentStoreOp.Store, VkImageLayout.ShaderReadOnlyOptimal);//GBuff2 (normals + AO)
+                       rpGBuff.AddAttachment (MRT_FORMAT, VkImageLayout.ShaderReadOnlyOptimal, NUM_SAMPLES, VkAttachmentLoadOp.Clear, VkAttachmentStoreOp.Store, VkImageLayout.ShaderReadOnlyOptimal);//GBuff3 (Pos + depth)
+
+                       rpGBuff.ClearValues.Add (new VkClearValue { depthStencil = new VkClearDepthStencilValue (1.0f, 0) });
+                       rpGBuff.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       rpGBuff.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       rpGBuff.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       rpGBuff.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+
+                       rpGBuff.AddSubpass (new SubPass ());
+                       rpGBuff.SubPasses [0].SetDepthReference (0, VkImageLayout.DepthStencilAttachmentOptimal);
+                       rpGBuff.SubPasses [0].AddColorReference (
+                                                                       new VkAttachmentReference (1, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (2, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (3, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (4, VkImageLayout.ColorAttachmentOptimal));
+
+                       rpGBuff.AddDependency (Vk.SubpassExternal, 0,
+                               VkPipelineStageFlags.BottomOfPipe, VkPipelineStageFlags.ColorAttachmentOutput,
+                               VkAccessFlags.MemoryRead, VkAccessFlags.ColorAttachmentWrite);
+                       rpGBuff.AddDependency (0, Vk.SubpassExternal,
+                               VkPipelineStageFlags.ColorAttachmentOutput, VkPipelineStageFlags.BottomOfPipe,
+                               VkAccessFlags.ColorAttachmentWrite, VkAccessFlags.MemoryRead);
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, NUM_SAMPLES);
+                       cfg.rasterizationState.cullMode = VkCullModeFlags.Back;
+                       if (NUM_SAMPLES != VkSampleCountFlags.SampleCount1) {
+                               cfg.multisampleState.sampleShadingEnable = true;
+                               cfg.multisampleState.minSampleShading = 0.5f;
+                       }
+                       cfg.Cache = pipelineCache;
+                       cfg.Layout = new PipelineLayout (dev, dslMain, dslMaterial);
+                       cfg.Layout.AddPushConstants (
+                               new VkPushConstantRange (VkShaderStageFlags.Vertex, 64),
+                               new VkPushConstantRange (VkShaderStageFlags.Fragment, sizeof (int), 64)
+                       );
+                       cfg.RenderPass = rpGBuff;
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       //cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+
+                       cfg.AddVertex<PbrModelTexArray.Vertex> ();
+                       using (SpecializationInfo constants = new SpecializationInfo (
+                                               new SpecializationConstant<float> (0, camera.NearPlane),
+                                               new SpecializationConstant<float> (1, camera.FarPlane),
+                                               new SpecializationConstant<float> (2, MAX_MATERIAL_COUNT))) {
+
+                               cfg.AddShader (VkShaderStageFlags.Vertex, "#RayTests.GBuffPbr.vert.spv");
+                               cfg.AddShader (VkShaderStageFlags.Fragment, "#RayTests.GBuffPbrTexArray.frag.spv", constants);
+
+                               plGBuff = new GraphicPipeline (cfg);
+                       }
+               }
+
+               void create_lighting_pipeline ()
+               {
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, NUM_SAMPLES);
+                       cfg.rasterizationState.cullMode = VkCullModeFlags.Front;
+                       if (NUM_SAMPLES != VkSampleCountFlags.SampleCount1) {
+                               cfg.multisampleState.sampleShadingEnable = true;
+                               cfg.multisampleState.minSampleShading = 0.5f;
+                       }
+                       cfg.Cache = pipelineCache;
+                       cfg.Layout = new PipelineLayout (dev, dslMain, dslLighting);
+                       cfg.RenderPass = new RenderPass (dev, swapChain.ColorFormat, NUM_SAMPLES);
+                       //cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.depthStencilState.depthTestEnable = false;
+                       cfg.depthStencilState.depthWriteEnable = false;
+
+                       using (SpecializationInfo constants = new SpecializationInfo (
+                               new SpecializationConstant<uint> (0, (uint)lights.Length))) {
+                               cfg.AddShader (VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
+                               cfg.AddShader (VkShaderStageFlags.Fragment, "#RayTests.compose.frag.spv", constants);
+                               plLighting = new GraphicPipeline (cfg);
+                       }
+               }
+
+               void init() {
+                       descriptorPool = new DescriptorPool (dev, 3,
+                               new VkDescriptorPoolSize (VkDescriptorType.UniformBuffer, 3),
+                               new VkDescriptorPoolSize (VkDescriptorType.CombinedImageSampler, 8)
+                       );
+
+                       dslMain = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, VkDescriptorType.UniformBuffer));//matrices and params
+                       dslMaterial = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.UniformBuffer),//materials
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler));//texture array)
+                       dslLighting = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),//color + roughness
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),//emit + metal
+                               new VkDescriptorSetLayoutBinding (2, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),//normals + AO
+                               new VkDescriptorSetLayoutBinding (3, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),//Pos + depth
+                               new VkDescriptorSetLayoutBinding (4, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),//irradiance
+                               new VkDescriptorSetLayoutBinding (5, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),//prefiltCube
+                               new VkDescriptorSetLayoutBinding (6, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),//lutBRDF
+                               new VkDescriptorSetLayoutBinding (7, VkShaderStageFlags.Fragment, VkDescriptorType.UniformBuffer));//lights
+
+                       uboMatrices = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, matrices, true);
+                       uboLights = new HostBuffer<Light> (dev, VkBufferUsageFlags.UniformBuffer, lights, true);
+
+                       create_gbuff_pipeline ();
+
+                       create_lighting_pipeline ();
+
+                       dsMain = descriptorPool.Allocate (dslMain);
+                       dsMain.Handle.SetDebugMarkerName (dev, "dsMain");
+                       dsMaterial = descriptorPool.Allocate (dslMaterial);
+                       dsMain.Handle.SetDebugMarkerName (dev, "dsMaterial");
+                       dsLighting = descriptorPool.Allocate (dslLighting);
+                       dsMain.Handle.SetDebugMarkerName (dev, "dsLighting");
+
+                       EnvironmentCube.STR_FRAG_PATH = "#RayTests.skybox.frag.spv";
+                       envCube = new EnvironmentCube (cubemapPathes[2], plLighting.Layout, presentQueue, plLighting.RenderPass);
+
+                       matrices.prefilteredCubeMipLevels = envCube.prefilterCube.CreateInfo.mipLevels;
+
+                       DescriptorSetWrites dsWrite = new DescriptorSetWrites (dsLighting, dslLighting.Bindings.GetRange (4, 4).ToArray());
+                       dsWrite.Write (dev,
+                               envCube.irradianceCube.Descriptor,
+                               envCube.prefilterCube.Descriptor,
+                               envCube.lutBrdf.Descriptor,
+                               uboLights.Descriptor);
+
+                       dsWrite = new DescriptorSetWrites (dsMain, dslMain);
+                       dsWrite.Write (dev, uboMatrices.Descriptor);
+               }
+
+
+               void createGBuff ()
+               {
+                       fbGBuff?.Dispose ();
+
+                       gbColorRough?.Dispose ();
+                       gbEmitMetal?.Dispose ();
+                       gbN_AO?.Dispose ();
+                       gbPos?.Dispose ();
+
+                       gbColorRough = new Image (dev, VkFormat.R8g8b8a8Unorm, VkImageUsageFlags.Sampled | VkImageUsageFlags.ColorAttachment , VkMemoryPropertyFlags.DeviceLocal, Width, Height, VkImageType.Image2D, NUM_SAMPLES);
+                       gbEmitMetal = new Image (dev, VkFormat.R8g8b8a8Unorm, VkImageUsageFlags.Sampled | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, Width, Height, VkImageType.Image2D, NUM_SAMPLES);
+                       gbN_AO = new Image (dev, MRT_FORMAT, VkImageUsageFlags.Sampled | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, Width, Height, VkImageType.Image2D, NUM_SAMPLES);
+                       gbPos = new Image (dev, MRT_FORMAT, VkImageUsageFlags.Sampled | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, Width, Height, VkImageType.Image2D, NUM_SAMPLES);
+
+
+                       gbColorRough.CreateView (); gbColorRough.CreateSampler ();
+                       gbColorRough.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+                       gbEmitMetal.CreateView (); gbEmitMetal.CreateSampler ();
+                       gbEmitMetal.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+                       gbN_AO.CreateView (); gbN_AO.CreateSampler ();
+                       gbN_AO.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+                       gbPos.CreateView (); gbPos.CreateSampler ();
+                       gbPos.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (dsLighting, dslLighting.Bindings.GetRange (0, 4).ToArray());
+                       uboUpdate.Write (dev,
+                               gbColorRough.Descriptor,
+                               gbEmitMetal.Descriptor,
+                               gbN_AO.Descriptor,
+                               gbPos.Descriptor);
+
+                       gbColorRough.SetName ("GBuffColorRough");
+                       gbEmitMetal.SetName ("GBuffEmitMetal");
+                       gbN_AO.SetName ("GBuffN");
+                       gbPos.SetName ("GBuffPos");
+
+                       fbGBuff = new FrameBuffer (rpGBuff, Width, Height, new Image [] {
+                                       null, gbColorRough, gbEmitMetal, gbN_AO, gbPos});
+               }
+
+               void buildCommandBuffers () {
+                       for (int i = 0; i < swapChain.ImageCount; ++i) {
+                               cmds[i]?.Free ();
+                               cmds[i] = cmdPool.AllocateAndStart ();
+                               CommandBuffer cmd = cmds [i];
+
+                               rpGBuff.Begin (cmd, fbGBuff);
+
+                               cmd.BindDescriptorSets (VkPipelineBindPoint.Graphics, plGBuff.Layout, 0, dsMain, dsMaterial);
+
+                               cmd.SetViewport (fbsMain [i].Width, fbsMain [i].Height);
+                               cmd.SetScissor (fbsMain [i].Width, fbsMain [i].Height);
+
+                               if (model != null) {
+                                       plGBuff.Bind (cmd);
+                                       model.Bind (cmd);
+                                       model.DrawAll (cmd, plGBuff.Layout);
+                               }
+
+                               rpGBuff.End (cmd);
+
+                               plLighting.RenderPass.Begin (cmd, fbsMain [i]);
+
+                               cmd.SetViewport (fbsMain [i].Width, fbsMain [i].Height);
+                               cmd.SetScissor (fbsMain [i].Width, fbsMain [i].Height);
+
+                               plLighting.Bind (cmd);
+                               plLighting.BindDescriptorSet (cmd, dsLighting, 1);
+
+                               cmd.Draw (3, 1, 0, 0);
+
+                               plLighting.RenderPass.End (cmd);
+
+                               cmd.End ();
+                       }
+               }
+
+               public override void UpdateView () {
+                       camera.AspectRatio = (float)Width / Height;
+
+                       matrices.projection = camera.Projection;
+                       matrices.view = camera.View;
+                       matrices.model = camera.Model;
+                       Matrix4x4.Invert (camera.View, out Matrix4x4 inv);
+                       matrices.camPos = new Vector4 (inv.M41, inv.M42, inv.M43, 0);
+
+                       uboMatrices.Update (matrices, (uint)Marshal.SizeOf<Matrices> ());
+
+                       updateViewRequested = false;
+               }
+
+               public override void Update () {
+                       if (reloadModel) {
+                               LoadModel (transferQ, modelPathes[curModelIndex]);
+
+                               updateViewRequested = true;
+                               rebuildBuffers = true;
+                       }
+
+                       if (rebuildBuffers) {
+                               buildCommandBuffers ();
+                               rebuildBuffers = false;
+                       }
+
+               }
+
+               protected override void OnResize () {
+                       base.OnResize ();
+
+                       dev.WaitIdle ();
+
+                       UpdateView ();
+
+                       createGBuff ();
+
+                       fbsMain?.Dispose();
+                       fbsMain = plLighting.RenderPass.CreateFrameBuffers(swapChain);
+
+                       rebuildBuffers = true;
+
+                       dev.WaitIdle ();
+               }
+
+               #region Mouse and keyboard
+               protected override void onScroll (double xOffset, double yOffset) {
+               }
+               protected override void onMouseMove (double xPos, double yPos) {
+                       double diffX = lastMouseX - xPos;
+                       double diffY = lastMouseY - yPos;
+                       if (MouseButton[0]) {
+                               camera.Rotate ((float)-diffX, (float)-diffY);
+                       } else if (MouseButton[1]) {
+                               camera.SetZoom ((float)diffY);
+                       } else
+                               return;
+
+                       updateViewRequested = true;
+               }
+
+               protected override void onKeyDown (Key key, int scanCode, Modifier modifiers) {
+                       //switch (key) {
+                       //      case Key.F:
+                       //              if (modifiers.HasFlag (Modifier.Shift)) {
+                       //                      renderer.debugFace--;
+                       //                      if (renderer.debugFace < 0)
+                       //                              renderer.debugFace = 5;
+                       //              } else {
+                       //                      renderer.debugFace++;
+                       //                      if (renderer.debugFace >= 5)
+                       //                              renderer.debugFace = 0;
+                       //              }
+                       //              rebuildBuffers = true;
+                       //              break;
+                       //      case Key.M:
+                       //              if (modifiers.HasFlag (Modifier.Shift)) {
+                       //                      renderer.debugMip--;
+                       //                      if (renderer.debugMip < 0)
+                       //                              renderer.debugMip = (int)renderer.envCube.prefilterCube.CreateInfo.mipLevels - 1;
+                       //              } else {
+                       //                      renderer.debugMip++;
+                       //                      if (renderer.debugMip >= renderer.envCube.prefilterCube.CreateInfo.mipLevels)
+                       //                              renderer.debugMip = 0;
+                       //              }
+                       //              rebuildBuffers = true;
+                       //              break;
+                       //      case Key.L:
+                       //              if (modifiers.HasFlag (Modifier.Shift)) {
+                       //                      renderer.lightNumDebug--;
+                       //                      if (renderer.lightNumDebug < 0)
+                       //                              renderer.lightNumDebug = (int)renderer.lights.Length - 1;
+                       //              } else {
+                       //                      renderer.lightNumDebug++;
+                       //                      if (renderer.lightNumDebug >= renderer.lights.Length)
+                       //                              renderer.lightNumDebug = 0;
+                       //              }
+                       //              rebuildBuffers = true;
+                       //              break;
+                       //      case Key.Keypad0:
+                       //      case Key.Keypad1:
+                       //      case Key.Keypad2:
+                       //      case Key.Keypad3:
+                       //      case Key.Keypad4:
+                       //      case Key.Keypad5:
+                       //      case Key.Keypad6:
+                       //      case Key.Keypad7:
+                       //      case Key.Keypad8:
+                       //      case Key.Keypad9:
+                       //              renderer.currentDebugView = (DeferredPbrRenderer.DebugView)(int)key-320;
+                       //              rebuildBuffers = true;
+                       //              break;
+                       //      case Key.KeypadDivide:
+                       //              renderer.currentDebugView = DeferredPbrRenderer.DebugView.irradiance;
+                       //              rebuildBuffers = true;
+                       //              break;
+                       //      case Key.S:
+                       //              if (modifiers.HasFlag (Modifier.Control)) {
+                       //                      renderer.pipelineCache.Save ();
+                       //                      Console.WriteLine ($"Pipeline Cache saved.");
+                       //              } else {
+                       //                      renderer.currentDebugView = DeferredPbrRenderer.DebugView.shadowMap;
+                       //                      rebuildBuffers = true; 
+                       //              }
+                       //              break;
+                       //      case Key.Up:
+                       //              if (modifiers.HasFlag (Modifier.Shift))
+                       //                      renderer.MoveLight(-Vector4.UnitZ);
+                       //              else
+                       //                      camera.Move (0, 0, 1);
+                       //              break;
+                       //      case Key.Down:
+                       //              if (modifiers.HasFlag (Modifier.Shift))
+                       //                      renderer.MoveLight (Vector4.UnitZ);
+                       //              else
+                       //                      camera.Move (0, 0, -1);
+                       //              break;
+                       //      case Key.Left:
+                       //              if (modifiers.HasFlag (Modifier.Shift))
+                       //                      renderer.MoveLight (-Vector4.UnitX);
+                       //              else
+                       //                      camera.Move (1, 0, 0);
+                       //              break;
+                       //      case Key.Right:
+                       //              if (modifiers.HasFlag (Modifier.Shift))
+                       //                      renderer.MoveLight (Vector4.UnitX);
+                       //              else
+                       //                      camera.Move (-1, 0, 0);
+                       //              break;
+                       //      case Key.PageUp:
+                       //              if (modifiers.HasFlag (Modifier.Shift))
+                       //                      renderer.MoveLight (Vector4.UnitY);
+                       //              else
+                       //                      camera.Move (0, 1, 0);
+                       //              break;
+                       //      case Key.PageDown:
+                       //              if (modifiers.HasFlag (Modifier.Shift))
+                       //                      renderer.MoveLight (-Vector4.UnitY);
+                       //              else
+                       //                      camera.Move (0, -1, 0);
+                       //              break;
+                       //      case Key.F2:
+                       //              if (modifiers.HasFlag (Modifier.Shift))
+                       //                      renderer.exposure -= 0.3f;
+                       //              else
+                       //                      renderer.exposure += 0.3f;
+                       //              rebuildBuffers = true;
+                       //              break;
+                       //      case Key.F3:
+                       //              if (modifiers.HasFlag (Modifier.Shift))
+                       //                      renderer.gamma -= 0.1f;
+                       //              else
+                       //                      renderer.gamma += 0.1f;
+                       //              rebuildBuffers = true;
+                       //              break;
+                       //      case Key.D:
+                       //              finalDebug = -finalDebug;
+                       //              rebuildBuffers = true;
+                       //              break;
+
+                       //      case Key.KeypadAdd:
+                       //              curModelIndex++;
+                       //              if (curModelIndex >= modelPathes.Length)
+                       //                      curModelIndex = 0;
+                       //              reloadModel = true;
+                       //              break;
+                       //      case Key.KeypadSubtract:
+                       //              curModelIndex--;
+                       //              if (curModelIndex < 0)
+                       //                      curModelIndex = modelPathes.Length -1;
+                       //              reloadModel = true;
+                       //              break;
+                       //      default:
+                       //              base.onKeyDown (key, scanCode, modifiers);
+                       //              return;
+                       //}
+                       updateViewRequested = true;
+               }
+               #endregion
+
+               protected override void Dispose (bool disposing) {
+                       dev.WaitIdle ();
+                       if (disposing) {
+                               if (!isDisposed) {
+                                       fbsMain?.Dispose();
+                                       fbGBuff?.Dispose ();
+
+                                       gbColorRough.Dispose ();
+                                       gbEmitMetal.Dispose ();
+                                       gbN_AO.Dispose ();
+                                       gbPos.Dispose ();
+
+                                       plGBuff.Dispose ();
+                                       plLighting.Dispose ();
+
+                                       uboMatrices.Dispose ();
+                                       uboLights.Dispose ();
+                                       model.Dispose ();
+                                       envCube.Dispose ();
+
+                                       descriptorPool.Dispose ();
+                                       dbgmsg.Dispose ();
+
+                                       pipelineCache.Dispose ();
+                               }
+                       }
+                       base.Dispose (disposing);
+               }
+       }
+}
diff --git a/samples/RayTests/mainShadow.cs b/samples/RayTests/mainShadow.cs
new file mode 100644 (file)
index 0000000..0bc3103
--- /dev/null
@@ -0,0 +1,415 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Glfw;
+using VK;
+using CVKL;
+
+namespace deferredShadow {
+       class Program : VkWindow{       
+               static void Main (string[] args) {
+                       using (Program vke = new Program ()) {
+                               vke.Run ();
+                       }
+               }
+
+               VkSampleCountFlags samples = VkSampleCountFlags.SampleCount1;
+
+               public struct Matrices {
+                       public Matrix4x4 projection;
+                       public Matrix4x4 view;
+                       public Matrix4x4 model;
+                       public Vector4 lightPos;
+                       public float gamma;
+                       public float exposure;
+               }
+
+               public Matrices matrices = new Matrices {
+                       lightPos = new Vector4 (1.0f, 0.0f, 0.0f, 1.0f),
+                       gamma = 1.0f,
+                       exposure = 2.0f,
+               };
+
+               const uint SHADOW_MAP_SIZE = 4096;
+
+#if DEBUG
+               PipelineStatisticsQueryPool statPool;
+               TimestampQueryPool timestampQPool;
+               ulong[] results;
+#endif
+
+               protected override void configureEnabledFeatures (ref VkPhysicalDeviceFeatures features) {
+                       base.configureEnabledFeatures (ref features);
+#if DEBUG
+                       features.pipelineStatisticsQuery = true;
+#endif
+               }
+
+               Program () : base(true) {
+                       //camera.Model = Matrix4x4.CreateRotationX (Utils.DegreesToRadians (-90)) * Matrix4x4.CreateRotationY (Utils.DegreesToRadians (180));
+                       //camera.SetRotation (-0.1f,-0.4f);
+                       camera.SetPosition (0, 0, -3);
+
+                       init ();
+
+#if DEBUG
+                       statPool = new PipelineStatisticsQueryPool (dev,
+                               VkQueryPipelineStatisticFlags.InputAssemblyVertices |
+                               VkQueryPipelineStatisticFlags.InputAssemblyPrimitives |
+                               VkQueryPipelineStatisticFlags.ClippingInvocations |
+                               VkQueryPipelineStatisticFlags.ClippingPrimitives |
+                               VkQueryPipelineStatisticFlags.FragmentShaderInvocations);
+
+                       timestampQPool = new TimestampQueryPool (dev);
+#endif
+               }
+
+               Framebuffer[] frameBuffers;
+               Image gbColorRough, gbEmitMetal, gbN, gbPos;
+
+               DescriptorPool descriptorPool;
+               DescriptorSetLayout descLayoutMain, descLayoutModelTextures, descLayoutGBuff;
+               DescriptorSet dsMain, dsGBuff;
+
+               Pipeline gBuffPipeline, composePipeline;
+
+               HostBuffer uboMats;
+
+               RenderPass renderPass;
+
+               Model model;
+               EnvironmentCube envCube;
+
+               DebugDrawPipeline debugDraw;
+               Framebuffer[] debugFB;
+
+               void init () {
+                       VkFormat depthFormat = dev.GetSuitableDepthFormat ();
+                       renderPass = new RenderPass (dev);
+
+                       renderPass.AddAttachment (swapChain.ColorFormat, VkImageLayout.ColorAttachmentOptimal, VkSampleCountFlags.SampleCount1);
+                       renderPass.AddAttachment (depthFormat, VkImageLayout.DepthStencilAttachmentOptimal, samples);
+                       renderPass.AddAttachment (VkFormat.R8g8b8a8Unorm, VkImageLayout.ColorAttachmentOptimal);
+                       renderPass.AddAttachment (VkFormat.R8g8b8a8Unorm, VkImageLayout.ColorAttachmentOptimal);
+                       renderPass.AddAttachment (VkFormat.R16g16b16a16Sfloat, VkImageLayout.ColorAttachmentOptimal);
+                       renderPass.AddAttachment (VkFormat.R16g16b16a16Sfloat, VkImageLayout.ColorAttachmentOptimal);
+                       //renderPass.AddAttachment (VkFormat.R16g16b16a16Sfloat, VkImageLayout.DepthStencilReadOnlyOptimal);
+
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+               renderPass.ClearValues.Add (new VkClearValue { depthStencil = new VkClearDepthStencilValue (1.0f, 0) });
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+
+                       SubPass[] subpass = { new SubPass (), new SubPass (), new SubPass() };
+                       subpass[0].AddColorReference (  new VkAttachmentReference (2, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (3, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (4, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (5, VkImageLayout.ColorAttachmentOptimal));
+                       subpass[0].SetDepthReference (1, VkImageLayout.DepthStencilAttachmentOptimal);
+
+                       subpass[1].AddColorReference (0, VkImageLayout.ColorAttachmentOptimal);
+                       subpass[1].AddInputReference (  new VkAttachmentReference (2, VkImageLayout.ShaderReadOnlyOptimal),
+                                                                       new VkAttachmentReference (3, VkImageLayout.ShaderReadOnlyOptimal),
+                                                                       new VkAttachmentReference (4, VkImageLayout.ShaderReadOnlyOptimal),
+                                                                       new VkAttachmentReference (5, VkImageLayout.ShaderReadOnlyOptimal));
+                       renderPass.AddSubpass (subpass);
+
+                       renderPass.AddDependency (Vk.SubpassExternal, 0,
+                VkPipelineStageFlags.BottomOfPipe, VkPipelineStageFlags.ColorAttachmentOutput,
+                VkAccessFlags.MemoryRead, VkAccessFlags.ColorAttachmentRead | VkAccessFlags.ColorAttachmentWrite);
+                       renderPass.AddDependency (0, 1,
+                VkPipelineStageFlags.ColorAttachmentOutput, VkPipelineStageFlags.FragmentShader,
+                VkAccessFlags.ColorAttachmentWrite, VkAccessFlags.ShaderRead);
+               renderPass.AddDependency (1, Vk.SubpassExternal,
+                VkPipelineStageFlags.ColorAttachmentOutput, VkPipelineStageFlags.BottomOfPipe,
+                VkAccessFlags.ColorAttachmentRead | VkAccessFlags.ColorAttachmentWrite, VkAccessFlags.MemoryRead);
+
+                        
+                       descriptorPool = new DescriptorPool (dev, 3,
+                               new VkDescriptorPoolSize (VkDescriptorType.UniformBuffer, 2),
+                               new VkDescriptorPoolSize (VkDescriptorType.CombinedImageSampler, 3),
+                               new VkDescriptorPoolSize (VkDescriptorType.InputAttachment, 4)
+                       );
+
+                       descLayoutMain = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, VkDescriptorType.UniformBuffer),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (2, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (3, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler));
+
+                       descLayoutModelTextures = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (2, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (3, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (4, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler)
+                       );
+
+                       descLayoutGBuff = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.InputAttachment),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.InputAttachment),
+                               new VkDescriptorSetLayoutBinding (2, VkShaderStageFlags.Fragment, VkDescriptorType.InputAttachment),
+                               new VkDescriptorSetLayoutBinding (3, VkShaderStageFlags.Fragment, VkDescriptorType.InputAttachment));
+
+                       dsMain = descriptorPool.Allocate (descLayoutMain);
+                       dsGBuff = descriptorPool.Allocate (descLayoutGBuff);
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, samples);
+                       cfg.Layout = new PipelineLayout (dev, descLayoutMain, descLayoutModelTextures, descLayoutGBuff);
+                       cfg.Layout.AddPushConstants (
+                               new VkPushConstantRange (VkShaderStageFlags.Vertex, (uint)Marshal.SizeOf<Matrix4x4> ()),
+                               new VkPushConstantRange (VkShaderStageFlags.Fragment, (uint)Marshal.SizeOf<Model.PbrMaterial> (), 64)
+                       );
+                       cfg.RenderPass = renderPass;
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+
+                       cfg.AddVertexBinding<Model.Vertex> (0);
+                       cfg.SetVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat, VkFormat.R32g32Sfloat);
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "shaders/pbrtest.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Fragment, "shaders/GBuffPbr.frag.spv");
+
+                       gBuffPipeline = new GraphicPipeline (cfg);
+                       cfg.blendAttachments.Clear ();
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.ResetShadersAndVerticesInfos ();
+                       cfg.SubpassIndex = 1;
+                       cfg.Layout = gBuffPipeline.Layout;
+                       cfg.depthStencilState.depthTestEnable = false;
+                       cfg.depthStencilState.depthWriteEnable = false;
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "shaders/FullScreenQuad.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Fragment, "shaders/pbrtest.frag.spv");
+                       composePipeline = new GraphicPipeline (cfg);
+
+                       envCube = new EnvironmentCube (presentQueue, renderPass);
+
+                       uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, (ulong)Marshal.SizeOf<Matrices> () * 2);
+                       uboMats.Map ();//permanent map
+
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (descLayoutMain);
+                       uboUpdate.Write (dev, dsMain, uboMats.Descriptor,
+                               envCube.lutBrdf.Descriptor,
+                               envCube.irradianceCube.Descriptor,
+                               envCube.prefilterCube.Descriptor);
+                       uboMats.Descriptor.offset = (ulong)Marshal.SizeOf<Matrices> ();
+                       envCube.WriteDesc (uboMats.Descriptor);
+#if DEBUG
+                       debugDraw = new DebugDrawPipeline (dev, descLayoutMain, swapChain.ColorFormat);
+                       debugDraw.AddLine (Vector3.Zero, new Vector3(matrices.lightPos.X,matrices.lightPos.Y,matrices.lightPos.Z)*3, 1, 1, 1);
+                       debugDraw.AddLine (Vector3.Zero, Vector3.UnitX, 1, 0, 0);
+                       debugDraw.AddLine (Vector3.Zero, Vector3.UnitY, 0, 1, 0);
+                       debugDraw.AddLine (Vector3.Zero, Vector3.UnitZ, 0, 0, 1);
+#endif
+
+
+                       model = new Model (presentQueue, "../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf");
+                       //model = new Model (presentQueue, "../data/models/chess.gltf");
+                       //model = new Model (presentQueue, "../data/models/Sponza/glTF/Sponza.gltf");
+                       //model = new Model (dev, presentQueue, "../data/models/icosphere.gltf");
+                       //model = new Model (dev, presentQueue, cmdPool, "../data/models/cube.gltf");
+                       model.WriteMaterialsDescriptorSets (descLayoutModelTextures,
+                               VK.AttachmentType.Color,
+                               VK.AttachmentType.Normal,
+                               VK.AttachmentType.AmbientOcclusion,
+                               VK.AttachmentType.PhysicalProps,
+                               VK.AttachmentType.Emissive);                            
+               }
+
+               void buildCommandBuffers () {
+                       for (int i = 0; i < swapChain.ImageCount; ++i) {
+                               cmds[i]?.Free ();
+                               cmds[i] = cmdPool.AllocateCommandBuffer ();
+                               cmds[i].Start ();
+
+#if DEBUG
+                               statPool.Begin (cmds[i]);
+                               recordDraw (cmds[i], frameBuffers[i]);
+                               statPool.End (cmds[i]);
+
+                               debugDraw.RecordDraw (cmds[i], debugFB[i], camera);
+#else
+                               recordDraw (cmds[i], frameBuffers[i]);
+#endif
+
+                               cmds[i].End ();
+                       }
+               }
+               void recordDraw (CommandBuffer cmd, Framebuffer fb) {
+                       renderPass.Begin (cmd, fb);
+
+                       cmd.SetViewport (fb.Width, fb.Height);
+                       cmd.SetScissor (fb.Width, fb.Height);
+
+                       cmd.BindDescriptorSet (gBuffPipeline.Layout, dsMain);
+                       gBuffPipeline.Bind (cmd);
+                       model.Bind (cmd);
+                       model.DrawAll (cmd, gBuffPipeline.Layout);
+
+                       renderPass.BeginSubPass (cmd);
+
+                       cmd.BindDescriptorSet (composePipeline.Layout, dsGBuff, 2);
+                       composePipeline.Bind (cmd);
+
+                       cmd.Draw (3, 1, 0, 0);
+
+                       renderPass.End (cmd);
+               }
+
+#region update
+               void updateMatrices () {
+                       camera.AspectRatio = (float)swapChain.Width / swapChain.Height;
+
+                       matrices.projection = camera.Projection;
+                       matrices.view = camera.View;
+                       matrices.model = camera.Model;
+                       uboMats.Update (matrices, (uint)Marshal.SizeOf<Matrices> ());
+                       matrices.view *= Matrix4x4.CreateTranslation (-matrices.view.Translation);
+                       matrices.model = Matrix4x4.Identity;
+                       uboMats.Update (matrices, (uint)Marshal.SizeOf<Matrices> (), (uint)Marshal.SizeOf<Matrices> ());
+               }
+
+               public override void UpdateView () {
+                       updateMatrices ();
+                       updateViewRequested = false;
+               }
+               public override void Update () {
+#if DEBUG
+                       results = statPool.GetResults ();
+#endif
+               }
+#endregion
+
+
+
+               void createGBuff () {
+                       gbColorRough?.Dispose ();
+                       gbEmitMetal?.Dispose ();
+                       gbN?.Dispose ();
+                       gbPos?.Dispose ();
+
+                       gbColorRough = new Image (dev, VkFormat.R8g8b8a8Unorm, VkImageUsageFlags.InputAttachment | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, swapChain.Width, swapChain.Height);
+                       gbEmitMetal = new Image (dev, VkFormat.R8g8b8a8Unorm, VkImageUsageFlags.InputAttachment | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, swapChain.Width, swapChain.Height);
+                       gbN = new Image (dev, VkFormat.R16g16b16a16Sfloat, VkImageUsageFlags.InputAttachment | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, swapChain.Width, swapChain.Height);
+                       gbPos = new Image (dev, VkFormat.R16g16b16a16Sfloat, VkImageUsageFlags.InputAttachment | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, swapChain.Width, swapChain.Height);
+
+                       gbColorRough.CreateView ();
+                       gbColorRough.CreateSampler ();
+                       gbEmitMetal.CreateView ();
+                       gbEmitMetal.CreateSampler ();
+                       gbN.CreateView ();
+                       gbN.CreateSampler ();
+                       gbPos.CreateView ();
+                       gbPos.CreateSampler ();
+
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (descLayoutGBuff);
+                       uboUpdate.Write (dev, dsGBuff,  gbColorRough.Descriptor,
+                                                                               gbEmitMetal.Descriptor,
+                                                                               gbN.Descriptor,
+                                                                               gbPos.Descriptor);
+                       gbColorRough.SetName ("GBuffColorRough");
+                       gbEmitMetal.SetName ("GBuffEmitMetal");
+                       gbN.SetName ("GBuffN");
+                       gbPos.SetName ("GBuffPos");
+               }
+
+               protected override void OnResize () {
+                       updateMatrices ();
+
+                       if (frameBuffers != null)
+                               for (int i = 0; i < swapChain.ImageCount; ++i)
+                                       frameBuffers[i]?.Dispose ();
+#if DEBUG
+                       if (debugFB != null)
+                               for (int i = 0; i < swapChain.ImageCount; ++i)
+                                       debugFB[i]?.Dispose ();
+#endif
+
+                       createGBuff ();
+
+                       frameBuffers = new Framebuffer[swapChain.ImageCount];
+                       debugFB = new Framebuffer[swapChain.ImageCount];
+
+                       for (int i = 0; i < swapChain.ImageCount; ++i) {
+                               frameBuffers[i] = new Framebuffer (renderPass, swapChain.Width, swapChain.Height, new Image[] {
+                                       swapChain.images[i], null, gbColorRough, gbEmitMetal, gbN, gbPos});
+#if DEBUG
+                               debugFB[i] = new Framebuffer (debugDraw.RenderPass, swapChain.Width, swapChain.Height,(debugDraw.Samples == VkSampleCountFlags.SampleCount1)
+                                       ? new Image[] { swapChain.images[i] } : new Image[] { null, swapChain.images[i] });
+                               debugFB[i].SetName ("main FB " + i);
+#endif
+                       }
+
+                       buildCommandBuffers ();
+               }
+
+
+               #region Mouse and keyboard
+               protected override void onKeyDown (Key key, int scanCode, Modifier modifiers) {
+                       switch (key) {
+                               case Key.F1:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               matrices.exposure -= 0.3f;
+                                       else
+                                               matrices.exposure += 0.3f;
+                                       break;
+                               case Key.F2:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               matrices.gamma -= 0.1f;
+                                       else
+                                               matrices.gamma += 0.1f;
+                                       break;
+                               case Key.F3:
+                                       if (camera.Type == Camera.CamType.FirstPerson)
+                                               camera.Type = Camera.CamType.LookAt;
+                                       else
+                                               camera.Type = Camera.CamType.FirstPerson;
+                                       Console.WriteLine ($"camera type = {camera.Type}");
+                                       break;
+                               default:
+                                       base.onKeyDown (key, scanCode, modifiers);
+                                       return;
+                       }
+                       updateViewRequested = true;
+               }
+#endregion
+
+               protected override void Dispose (bool disposing) {
+                       if (disposing) {
+                               if (!isDisposed) {
+                                       dev.WaitIdle ();
+                                       for (int i = 0; i < swapChain.ImageCount; ++i)
+                                               frameBuffers[i]?.Dispose ();
+
+                                       gbColorRough.Dispose ();
+                                       gbEmitMetal.Dispose ();
+                                       gbN.Dispose ();
+                                       gbPos.Dispose ();
+
+                                       gBuffPipeline.Dispose ();
+                                       composePipeline.Dispose ();
+
+                                       descLayoutMain.Dispose ();
+                                       descLayoutModelTextures.Dispose ();
+                                       descLayoutGBuff.Dispose ();
+
+                                       uboMats.Dispose ();
+                                       model.Dispose ();
+                                       envCube.Dispose ();
+
+                                       descriptorPool.Dispose ();
+#if DEBUG
+                                       debugDraw.Dispose ();
+                                       timestampQPool?.Dispose ();
+                                       statPool?.Dispose ();
+#endif
+                               }
+                       }
+
+                       base.Dispose (disposing);
+               }
+       }
+}
diff --git a/samples/RayTests/mainWithDebugDrawer.cs b/samples/RayTests/mainWithDebugDrawer.cs
new file mode 100644 (file)
index 0000000..f95ed0a
--- /dev/null
@@ -0,0 +1,412 @@
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Glfw;
+using VK;
+using CVKL;
+
+namespace deferredDebug {
+       class Program : VkWindow{       
+               static void Main (string[] args) {
+                       using (Program vke = new Program ()) {
+                               vke.Run ();
+                       }
+               }
+
+               VkSampleCountFlags samples = VkSampleCountFlags.SampleCount1;
+
+               public struct Matrices {
+                       public Matrix4x4 projection;
+                       public Matrix4x4 view;
+                       public Matrix4x4 model;
+                       public Vector4 lightPos;
+                       public float gamma;
+                       public float exposure;
+               }
+
+               public Matrices matrices = new Matrices {
+                       lightPos = new Vector4 (1.0f, 0, 0, 1.0f),
+                       gamma = 1.0f,
+                       exposure = 2.0f,
+               };
+
+#if DEBUG
+               PipelineStatisticsQueryPool statPool;
+               TimestampQueryPool timestampQPool;
+               ulong[] results;
+#endif
+
+               protected override void configureEnabledFeatures (ref VkPhysicalDeviceFeatures features) {
+                       base.configureEnabledFeatures (ref features);
+#if DEBUG
+                       features.pipelineStatisticsQuery = true;
+#endif
+               }
+
+               Program () : base(true) {
+                       camera.Model = Matrix4x4.CreateRotationX (Utils.DegreesToRadians (-90)) * Matrix4x4.CreateRotationY (Utils.DegreesToRadians (180));
+                       camera.SetRotation (-0.1f,-0.4f);
+                       camera.SetPosition (0, 0, -3);
+
+                       init ();
+
+#if DEBUG
+                       statPool = new PipelineStatisticsQueryPool (dev,
+                               VkQueryPipelineStatisticFlags.InputAssemblyVertices |
+                               VkQueryPipelineStatisticFlags.InputAssemblyPrimitives |
+                               VkQueryPipelineStatisticFlags.ClippingInvocations |
+                               VkQueryPipelineStatisticFlags.ClippingPrimitives |
+                               VkQueryPipelineStatisticFlags.FragmentShaderInvocations);
+
+                       timestampQPool = new TimestampQueryPool (dev);
+#endif
+               }
+
+               Framebuffer[] frameBuffers;
+               Image gbColorRough, gbEmitMetal, gbN, gbPos;
+
+               DescriptorPool descriptorPool;
+               DescriptorSetLayout descLayoutMain, descLayoutModelTextures, descLayoutGBuff;
+               DescriptorSet dsMain, dsGBuff;
+
+               Pipeline gBuffPipeline, composePipeline;
+
+               HostBuffer uboMats;
+
+               RenderPass renderPass;
+
+               Model model;
+               EnvironmentCube envCube;
+
+               DebugDrawPipeline debugDraw;
+               Framebuffer[] debugFB;
+
+               void init () {
+                       renderPass = new RenderPass (dev);
+                       renderPass.AddAttachment (swapChain.ColorFormat, VkImageLayout.ColorAttachmentOptimal, VkSampleCountFlags.SampleCount1);
+                       renderPass.AddAttachment (dev.GetSuitableDepthFormat(), VkImageLayout.DepthStencilAttachmentOptimal, samples);
+                       renderPass.AddAttachment (VkFormat.R8g8b8a8Unorm, VkImageLayout.ColorAttachmentOptimal);
+                       renderPass.AddAttachment (VkFormat.R8g8b8a8Unorm, VkImageLayout.ColorAttachmentOptimal);
+                       renderPass.AddAttachment (VkFormat.R16g16b16a16Sfloat, VkImageLayout.ColorAttachmentOptimal);
+                       renderPass.AddAttachment (VkFormat.R16g16b16a16Sfloat, VkImageLayout.ColorAttachmentOptimal);
+
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+               renderPass.ClearValues.Add (new VkClearValue { depthStencil = new VkClearDepthStencilValue (1.0f, 0) });
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+                       renderPass.ClearValues.Add (new VkClearValue { color = new VkClearColorValue (0.0f, 0.0f, 0.0f) });
+
+                       SubPass[] subpass = { new SubPass (), new SubPass () };
+                       subpass[0].AddColorReference (  new VkAttachmentReference (2, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (3, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (4, VkImageLayout.ColorAttachmentOptimal),
+                                                                       new VkAttachmentReference (5, VkImageLayout.ColorAttachmentOptimal));
+                       subpass[0].SetDepthReference (1, VkImageLayout.DepthStencilAttachmentOptimal);
+
+                       subpass[1].AddColorReference (0, VkImageLayout.ColorAttachmentOptimal);
+                       subpass[1].AddInputReference (  new VkAttachmentReference (2, VkImageLayout.ShaderReadOnlyOptimal),
+                                                                       new VkAttachmentReference (3, VkImageLayout.ShaderReadOnlyOptimal),
+                                                                       new VkAttachmentReference (4, VkImageLayout.ShaderReadOnlyOptimal),
+                                                                       new VkAttachmentReference (5, VkImageLayout.ShaderReadOnlyOptimal));
+                       renderPass.AddSubpass (subpass);
+
+                       renderPass.AddDependency (Vk.SubpassExternal, 0,
+                VkPipelineStageFlags.BottomOfPipe, VkPipelineStageFlags.ColorAttachmentOutput,
+                VkAccessFlags.MemoryRead, VkAccessFlags.ColorAttachmentRead | VkAccessFlags.ColorAttachmentWrite);
+                       renderPass.AddDependency (0, 1,
+                VkPipelineStageFlags.ColorAttachmentOutput, VkPipelineStageFlags.FragmentShader,
+                VkAccessFlags.ColorAttachmentWrite, VkAccessFlags.ShaderRead);
+               renderPass.AddDependency (1, Vk.SubpassExternal,
+                VkPipelineStageFlags.ColorAttachmentOutput, VkPipelineStageFlags.BottomOfPipe,
+                VkAccessFlags.ColorAttachmentRead | VkAccessFlags.ColorAttachmentWrite, VkAccessFlags.MemoryRead);
+
+                        
+                       descriptorPool = new DescriptorPool (dev, 3,
+                               new VkDescriptorPoolSize (VkDescriptorType.UniformBuffer, 2),
+                               new VkDescriptorPoolSize (VkDescriptorType.CombinedImageSampler, 3),
+                               new VkDescriptorPoolSize (VkDescriptorType.InputAttachment, 4)
+                       );
+
+                       descLayoutMain = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, VkDescriptorType.UniformBuffer),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (2, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (3, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler));
+
+                       descLayoutModelTextures = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (2, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (3, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (4, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler)
+                       );
+
+                       descLayoutGBuff = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.InputAttachment),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.InputAttachment),
+                               new VkDescriptorSetLayoutBinding (2, VkShaderStageFlags.Fragment, VkDescriptorType.InputAttachment),
+                               new VkDescriptorSetLayoutBinding (3, VkShaderStageFlags.Fragment, VkDescriptorType.InputAttachment));
+
+                       dsMain = descriptorPool.Allocate (descLayoutMain);
+                       dsGBuff = descriptorPool.Allocate (descLayoutGBuff);
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, samples);
+                       cfg.Layout = new PipelineLayout (dev, descLayoutMain, descLayoutModelTextures, descLayoutGBuff);
+                       cfg.Layout.AddPushConstants (
+                               new VkPushConstantRange (VkShaderStageFlags.Vertex, (uint)Marshal.SizeOf<Matrix4x4> ()),
+                               new VkPushConstantRange (VkShaderStageFlags.Fragment, sizeof(int), 64)
+                       );
+                       cfg.RenderPass = renderPass;
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+
+                       cfg.AddVertexBinding<Model.Vertex> (0);
+                       cfg.SetVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat, VkFormat.R32g32Sfloat);
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "shaders/pbrtest.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Fragment, "shaders/GBuffPbr.frag.spv");
+
+                       gBuffPipeline = new GraphicPipeline (cfg);
+                       cfg.blendAttachments.Clear ();
+                       cfg.blendAttachments.Add (new VkPipelineColorBlendAttachmentState (false));
+                       cfg.ResetShadersAndVerticesInfos ();
+                       cfg.SubpassIndex = 1;
+                       cfg.Layout = gBuffPipeline.Layout;
+                       cfg.depthStencilState.depthTestEnable = false;
+                       cfg.depthStencilState.depthWriteEnable = false;
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "shaders/FullScreenQuad.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Fragment, "shaders/pbrtest.frag.spv");
+                       composePipeline = new GraphicPipeline (cfg);
+
+                       envCube = new EnvironmentCube (presentQueue, renderPass);
+
+                       uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, (ulong)Marshal.SizeOf<Matrices> () * 2);
+                       uboMats.Map ();//permanent map
+
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (descLayoutMain);
+                       uboUpdate.Write (dev, dsMain, uboMats.Descriptor,
+                               envCube.lutBrdf.Descriptor,
+                               envCube.irradianceCube.Descriptor,
+                               envCube.prefilterCube.Descriptor);
+                       uboMats.Descriptor.offset = (ulong)Marshal.SizeOf<Matrices> ();
+                       envCube.WriteDesc (uboMats.Descriptor);
+#if DEBUG
+                       debugDraw = new DebugDrawPipeline (dev, descLayoutMain, swapChain.ColorFormat);
+                       debugDraw.AddLine (Vector3.Zero, new Vector3(matrices.lightPos.X,matrices.lightPos.Y,matrices.lightPos.Z)*3, 1, 1, 1);
+                       debugDraw.AddLine (Vector3.Zero, Vector3.UnitX, 1, 0, 0);
+                       debugDraw.AddLine (Vector3.Zero, Vector3.UnitY, 0, 1, 0);
+                       debugDraw.AddLine (Vector3.Zero, Vector3.UnitZ, 0, 0, 1);
+#endif
+
+
+                       model = new Model (presentQueue, "../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf");
+                       //model = new Model (presentQueue, "../data/models/chess.gltf");
+                       //model = new Model (presentQueue, "../data/models/Sponza/glTF/Sponza.gltf");
+                       //model = new Model (dev, presentQueue, "../data/models/icosphere.gltf");
+                       //model = new Model (dev, presentQueue, cmdPool, "../data/models/cube.gltf");
+                       model.WriteMaterialsDescriptorSets (descLayoutModelTextures,
+                               VK.AttachmentType.Color,
+                               VK.AttachmentType.Normal,
+                               VK.AttachmentType.AmbientOcclusion,
+                               VK.AttachmentType.PhysicalProps,
+                               VK.AttachmentType.Emissive);                            
+               }
+
+               void buildCommandBuffers () {
+                       for (int i = 0; i < swapChain.ImageCount; ++i) {
+                               cmds[i]?.Free ();
+                               cmds[i] = cmdPool.AllocateCommandBuffer ();
+                               cmds[i].Start ();
+
+#if DEBUG
+                               statPool.Begin (cmds[i]);
+                               recordDraw (cmds[i], frameBuffers[i]);
+                               statPool.End (cmds[i]);
+
+                               debugDraw.RecordDraw (cmds[i], debugFB[i], camera);
+#else
+                               recordDraw (cmds[i], frameBuffers[i]);
+#endif
+
+                               cmds[i].End ();
+                       }
+               }
+               void recordDraw (CommandBuffer cmd, Framebuffer fb) {
+                       renderPass.Begin (cmd, fb);
+
+                       cmd.SetViewport (fb.Width, fb.Height);
+                       cmd.SetScissor (fb.Width, fb.Height);
+
+                       cmd.BindDescriptorSet (gBuffPipeline.Layout, dsMain);
+                       gBuffPipeline.Bind (cmd);
+                       model.Bind (cmd);
+                       model.DrawAll (cmd, gBuffPipeline.Layout);
+
+                       renderPass.BeginSubPass (cmd);
+
+                       cmd.BindDescriptorSet (composePipeline.Layout, dsGBuff, 2);
+                       composePipeline.Bind (cmd);
+
+                       cmd.Draw (3, 1, 0, 0);
+
+                       renderPass.End (cmd);
+               }
+
+#region update
+               void updateMatrices () {
+                       camera.AspectRatio = (float)swapChain.Width / swapChain.Height;
+
+                       matrices.projection = camera.Projection;
+                       matrices.view = camera.View;
+                       matrices.model = camera.Model;
+                       uboMats.Update (matrices, (uint)Marshal.SizeOf<Matrices> ());
+                       matrices.view *= Matrix4x4.CreateTranslation (-matrices.view.Translation);
+                       matrices.model = Matrix4x4.Identity;
+                       uboMats.Update (matrices, (uint)Marshal.SizeOf<Matrices> (), (uint)Marshal.SizeOf<Matrices> ());
+               }
+
+               public override void UpdateView () {
+                       updateMatrices ();
+                       updateViewRequested = false;
+               }
+               public override void Update () {
+#if DEBUG
+                       results = statPool.GetResults ();
+#endif
+               }
+#endregion
+
+
+
+               void createGBuff () {
+                       gbColorRough?.Dispose ();
+                       gbEmitMetal?.Dispose ();
+                       gbN?.Dispose ();
+                       gbPos?.Dispose ();
+
+                       gbColorRough = new Image (dev, VkFormat.R8g8b8a8Unorm, VkImageUsageFlags.InputAttachment | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, swapChain.Width, swapChain.Height);
+                       gbEmitMetal = new Image (dev, VkFormat.R8g8b8a8Unorm, VkImageUsageFlags.InputAttachment | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, swapChain.Width, swapChain.Height);
+                       gbN = new Image (dev, VkFormat.R16g16b16a16Sfloat, VkImageUsageFlags.InputAttachment | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, swapChain.Width, swapChain.Height);
+                       gbPos = new Image (dev, VkFormat.R16g16b16a16Sfloat, VkImageUsageFlags.InputAttachment | VkImageUsageFlags.ColorAttachment, VkMemoryPropertyFlags.DeviceLocal, swapChain.Width, swapChain.Height);
+
+                       gbColorRough.CreateView ();
+                       gbColorRough.CreateSampler ();
+                       gbEmitMetal.CreateView ();
+                       gbEmitMetal.CreateSampler ();
+                       gbN.CreateView ();
+                       gbN.CreateSampler ();
+                       gbPos.CreateView ();
+                       gbPos.CreateSampler ();
+
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (descLayoutGBuff);
+                       uboUpdate.Write (dev, dsGBuff,  gbColorRough.Descriptor,
+                                                                               gbEmitMetal.Descriptor,
+                                                                               gbN.Descriptor,
+                                                                               gbPos.Descriptor);
+                       gbColorRough.SetName ("GBuffColorRough");
+                       gbEmitMetal.SetName ("GBuffEmitMetal");
+                       gbN.SetName ("GBuffN");
+                       gbPos.SetName ("GBuffPos");
+               }
+
+               protected override void OnResize () {
+                       updateMatrices ();
+
+                       if (frameBuffers != null)
+                               for (int i = 0; i < swapChain.ImageCount; ++i)
+                                       frameBuffers[i]?.Dispose ();
+#if DEBUG
+                       if (debugFB != null)
+                               for (int i = 0; i < swapChain.ImageCount; ++i)
+                                       debugFB[i]?.Dispose ();
+#endif
+
+                       createGBuff ();
+
+                       frameBuffers = new Framebuffer[swapChain.ImageCount];
+                       debugFB = new Framebuffer[swapChain.ImageCount];
+
+                       for (int i = 0; i < swapChain.ImageCount; ++i) {
+                               frameBuffers[i] = new Framebuffer (renderPass, swapChain.Width, swapChain.Height, new Image[] {
+                                       swapChain.images[i], null, gbColorRough, gbEmitMetal, gbN, gbPos});
+#if DEBUG
+                               debugFB[i] = new Framebuffer (debugDraw.RenderPass, swapChain.Width, swapChain.Height,(debugDraw.Samples == VkSampleCountFlags.SampleCount1)
+                                       ? new Image[] { swapChain.images[i] } : new Image[] { null, swapChain.images[i] });
+                               debugFB[i].SetName ("main FB " + i);
+#endif
+                       }
+
+                       buildCommandBuffers ();
+               }
+
+
+               #region Mouse and keyboard
+               protected override void onKeyDown (Key key, int scanCode, Modifier modifiers) {
+                       switch (key) {
+                               case Key.F1:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               matrices.exposure -= 0.3f;
+                                       else
+                                               matrices.exposure += 0.3f;
+                                       break;
+                               case Key.F2:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               matrices.gamma -= 0.1f;
+                                       else
+                                               matrices.gamma += 0.1f;
+                                       break;
+                               case Key.F3:
+                                       if (camera.Type == Camera.CamType.FirstPerson)
+                                               camera.Type = Camera.CamType.LookAt;
+                                       else
+                                               camera.Type = Camera.CamType.FirstPerson;
+                                       Console.WriteLine ($"camera type = {camera.Type}");
+                                       break;
+                               default:
+                                       base.onKeyDown (key, scanCode, modifiers);
+                                       return;
+                       }
+                       updateViewRequested = true;
+               }
+#endregion
+
+               protected override void Dispose (bool disposing) {
+                       if (disposing) {
+                               if (!isDisposed) {
+                                       dev.WaitIdle ();
+                                       for (int i = 0; i < swapChain.ImageCount; ++i)
+                                               frameBuffers[i]?.Dispose ();
+
+                                       gbColorRough.Dispose ();
+                                       gbEmitMetal.Dispose ();
+                                       gbN.Dispose ();
+                                       gbPos.Dispose ();
+
+                                       gBuffPipeline.Dispose ();
+                                       composePipeline.Dispose ();
+
+                                       descLayoutMain.Dispose ();
+                                       descLayoutModelTextures.Dispose ();
+                                       descLayoutGBuff.Dispose ();
+
+                                       uboMats.Dispose ();
+                                       model.Dispose ();
+                                       envCube.Dispose ();
+
+                                       descriptorPool.Dispose ();
+#if DEBUG
+                                       foreach (Framebuffer fb in debugFB) 
+                                               fb.Dispose ();
+
+                                       debugDraw.Dispose ();
+                                       timestampQPool?.Dispose ();
+                                       statPool?.Dispose ();
+#endif
+                               }
+                       }
+
+                       base.Dispose (disposing);
+               }
+       }
+}
diff --git a/samples/RayTests/modelWithVkvgStats.cs b/samples/RayTests/modelWithVkvgStats.cs
new file mode 100644 (file)
index 0000000..f4ea123
--- /dev/null
@@ -0,0 +1,359 @@
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Glfw;
+using CVKL;
+using VK;
+using static CVKL.Camera;
+
+namespace modelWithVkvgStats {
+       class Program : VkWindow {
+
+               PipelineStatisticsQueryPool statPool;
+               TimestampQueryPool timestampQPool;
+
+               ulong[] results;
+
+               protected override void configureEnabledFeatures (ref VkPhysicalDeviceFeatures features) {
+                       base.configureEnabledFeatures (ref features);
+                       features.pipelineStatisticsQuery = true;
+               }
+               public struct Matrices {
+                       public Matrix4x4 projection;
+                       public Matrix4x4 view;
+                       public Matrix4x4 model;
+                       public Vector4 lightPos;
+                       public float gamma;
+                       public float exposure;
+               }
+
+               public Matrices matrices = new Matrices { 
+                       lightPos = new Vector4 (0.0f, 0.0f, -2.0f, 1.0f),
+                       gamma = 1.0f,
+                       exposure = 2.0f,
+               };
+
+               HostBuffer uboMats;
+
+               DescriptorPool descriptorPool;
+               DescriptorSetLayout descLayoutMatrix;
+               DescriptorSetLayout descLayoutTextures;
+               DescriptorSet dsMats;
+
+               GraphicPipeline pipeline;
+               GraphicPipeline uiPipeline;
+               Framebuffer[] frameBuffers;
+
+               Model model;
+
+               vkvg.Device vkvgDev;
+        vkvg.Surface vkvgSurf;
+               Image vkvgImage;
+
+        void vkvgDraw () {
+
+            using (vkvg.Context ctx = new vkvg.Context (vkvgSurf)) {
+                               ctx.Operator = vkvg.Operator.Clear;
+                               ctx.Paint ();
+                               ctx.Operator = vkvg.Operator.Over;
+
+                               ctx.LineWidth = 1;
+                               ctx.SetSource (0.1, 0.1, 0.1, 0.3);
+                               ctx.Rectangle (5.5, 5.5, 400, 250);
+                               ctx.FillPreserve ();
+                               ctx.Flush ();
+                               ctx.SetSource (0.8, 0.8, 0.8);
+                               ctx.Stroke ();
+
+                               ctx.FontFace = "mono";
+                               ctx.FontSize = 10;
+                               int x = 16;
+                               int y = 40, dy = 16;
+                               ctx.MoveTo (x, y);
+                               ctx.ShowText (string.Format ($"fps:     {fps,5} "));
+                               ctx.MoveTo (x + 200, y - 0.5);
+                               ctx.Rectangle (x + 200, y - 8.5, 0.1 * fps, 10);
+                               ctx.SetSource (0.1, 0.9, 0.1);
+                               ctx.Fill ();
+                               ctx.SetSource (0.8, 0.8, 0.8);
+                               y += dy;
+                               ctx.MoveTo (x, y);
+                               ctx.ShowText (string.Format ($"Exposure:{matrices.exposure,5} "));
+                               y += dy;
+                               ctx.MoveTo (x, y);
+                               ctx.ShowText (string.Format ($"Gamma:   {matrices.gamma,5} "));
+                               if (results == null)
+                                       return;
+
+                               y += dy*2;
+                               ctx.MoveTo (x, y);
+                               ctx.ShowText ("Pipeline Statistics");
+                               ctx.MoveTo (x-2, 2.5+y);
+                               ctx.LineTo (x+160, 2.5+y);
+                               ctx.Stroke ();
+                               y += 4;
+                               x += 20;
+
+                               for (int i = 0; i < statPool.RequestedStats.Length; i++) {
+                                       y += dy;
+                                       ctx.MoveTo (x, y);
+                                       ctx.ShowText (string.Format ($"{statPool.RequestedStats[i].ToString(),-30} :{results[i],12:0,0} "));
+                               }
+
+                               y += dy;
+                               ctx.MoveTo (x, y);
+                               ctx.ShowText (string.Format ($"{"Elapsed microsecond",-20} :{timestampQPool.ElapsedMiliseconds:0.0000} "));
+                       }
+               }
+
+               Program () : base () {
+                       vkvgDev = new vkvg.Device (instance.Handle, phy.Handle, dev.VkDev.Handle, presentQueue.qFamIndex,
+                               vkvg.SampleCount.Sample_4, presentQueue.index);
+
+                       camera.Type = CamType.FirstPerson;
+                       camera.Model = Matrix4x4.CreateScale (0.05f) * Matrix4x4.CreateRotationX((float)Math.PI);
+                       //Camera.SetRotation (-0.1f,-0.4f);
+                       camera.SetPosition (0, 2, -3);
+                                       
+                       init ();
+
+                       model = new Model (presentQueue, "../data/models/Sponza/glTF/Sponza.gltf");
+                       model.WriteMaterialsDescriptorSets (descLayoutTextures,
+                               VK.AttachmentType.Color,
+                               VK.AttachmentType.Normal,
+                               VK.AttachmentType.AmbientOcclusion,
+                               VK.AttachmentType.PhysicalProps,
+                               VK.AttachmentType.Emissive);
+               }
+
+               void init (VkSampleCountFlags samples = VkSampleCountFlags.SampleCount4) { 
+                       descriptorPool = new DescriptorPool (dev, 2,
+                               new VkDescriptorPoolSize (VkDescriptorType.UniformBuffer),
+                               new VkDescriptorPoolSize (VkDescriptorType.CombinedImageSampler)
+                       );
+
+                       descLayoutMatrix = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Vertex|VkShaderStageFlags.Fragment, VkDescriptorType.UniformBuffer),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler)
+                       );
+
+                       descLayoutTextures = new DescriptorSetLayout (dev, 
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (2, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (3, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler),
+                               new VkDescriptorSetLayoutBinding (4, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler)
+                       );
+
+                       dsMats = descriptorPool.Allocate (descLayoutMatrix);
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, samples);
+
+                       cfg.Layout = new PipelineLayout (dev, descLayoutMatrix, descLayoutTextures);
+                       cfg.Layout.AddPushConstants (
+                               new VkPushConstantRange (VkShaderStageFlags.Vertex, (uint)Marshal.SizeOf<Matrix4x4> ()),
+                               new VkPushConstantRange (VkShaderStageFlags.Fragment, (uint)Marshal.SizeOf<Model.PbrMaterial> (), 64)
+                       );
+                       cfg.RenderPass = new RenderPass (dev, swapChain.ColorFormat, dev.GetSuitableDepthFormat (), samples);
+
+                       cfg.AddVertexBinding<Model.Vertex> (0);
+                       cfg.SetVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat, VkFormat.R32g32Sfloat);
+
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "shaders/pbrtest.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Fragment, "shaders/pbrtest.frag.spv");
+
+                       pipeline = new GraphicPipeline (cfg);
+
+                       cfg.ResetShadersAndVerticesInfos ();
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "shaders/FullScreenQuad.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Fragment, "shaders/simpletexture.frag.spv");
+
+                       cfg.blendAttachments[0] = new VkPipelineColorBlendAttachmentState (true);
+
+                       uiPipeline = new GraphicPipeline (cfg);
+
+                       uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, (ulong)Marshal.SizeOf<Matrices>());
+                       uboMats.Map ();//permanent map
+
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (dsMats, descLayoutMatrix.Bindings[0]);                         
+                       uboUpdate.Write (dev, uboMats.Descriptor);
+
+                       cfg.Layout.SetName ("Main Pipeline layout");
+                       uboMats.SetName ("uboMats");
+                       descriptorPool.SetName ("main pool");
+                       descLayoutTextures.SetName ("descLayoutTextures");
+
+                       statPool = new PipelineStatisticsQueryPool (dev,
+                               VkQueryPipelineStatisticFlags.InputAssemblyVertices |
+                               VkQueryPipelineStatisticFlags.InputAssemblyPrimitives |
+                               VkQueryPipelineStatisticFlags.ClippingInvocations |
+                               VkQueryPipelineStatisticFlags.ClippingPrimitives |
+                               VkQueryPipelineStatisticFlags.FragmentShaderInvocations);
+
+                       timestampQPool = new TimestampQueryPool (dev);
+
+               }
+
+               void buildCommandBuffers () {
+                       for (int i = 0; i < swapChain.ImageCount; ++i) {                                                                
+                cmds[i]?.Free ();
+
+                               cmds[i] = cmdPool.AllocateCommandBuffer ();
+                               cmds[i].Start ();
+
+                               statPool.Begin (cmds[i]);
+                               cmds[i].BeginRegion ("draw" + i, 0.5f, 1f, 0f);
+                               cmds[i].Handle.SetDebugMarkerName (dev, "cmd Draw" + i); 
+                               recordDraw (cmds[i], frameBuffers[i]);
+                               cmds[i].EndRegion ();
+                               statPool.End (cmds[i]);                 
+                               cmds[i].End ();
+                       }
+               } 
+               void recordDraw (CommandBuffer cmd, Framebuffer fb) {
+                       cmd.BeginRegion ("models", 0.5f, 1f, 0f);
+                       pipeline.RenderPass.Begin (cmd, fb);
+
+                       cmd.SetViewport (fb.Width, fb.Height);
+                       cmd.SetScissor (fb.Width, fb.Height);
+
+                       cmd.BindDescriptorSet (pipeline.Layout, dsMats);
+                       pipeline.Bind (cmd);
+                       model.Bind (cmd);
+                       model.DrawAll (cmd, pipeline.Layout);
+
+                       cmd.EndRegion ();
+                       cmd.BeginRegion ("vkvg", 0.5f, 1f, 0f);
+                       uiPipeline.Bind (cmd);
+
+                       timestampQPool.Start (cmd);
+
+                       vkvgImage.SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.ColorAttachmentOptimal, VkImageLayout.ShaderReadOnlyOptimal,
+                               VkPipelineStageFlags.ColorAttachmentOutput, VkPipelineStageFlags.FragmentShader);
+
+                       cmd.Draw (3, 1, 0, 0);
+
+                       vkvgImage.SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.ShaderReadOnlyOptimal, VkImageLayout.ColorAttachmentOptimal,
+                               VkPipelineStageFlags.FragmentShader, VkPipelineStageFlags.BottomOfPipe);
+
+                       timestampQPool.End (cmd);
+
+                       pipeline.RenderPass.End (cmd);
+                       cmd.EndRegion ();
+               }
+
+               #region update
+               void updateMatrices () {
+
+                       camera.AspectRatio = (float)swapChain.Width / swapChain.Height;
+
+                       matrices.projection = camera.Projection;
+                       matrices.view = camera.View;
+                       matrices.model = camera.Model;
+                       uboMats.Update (matrices, (uint)Marshal.SizeOf<Matrices> ());
+               }
+                       
+               public override void UpdateView () {
+                       updateMatrices ();
+                       updateViewRequested = false;
+               }
+               public override void Update () {
+                       results = statPool.GetResults ();
+                       vkvgDraw ();
+               }
+               #endregion
+
+               #region mouse and keyboard
+               protected override void onKeyDown (Key key, int scanCode, Modifier modifiers) {
+                       switch (key) {
+                               case Key.F1:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               matrices.exposure -= 0.3f;
+                                       else
+                                               matrices.exposure += 0.3f;
+                                       break;
+                               case Key.F2:
+                                       if (modifiers.HasFlag (Modifier.Shift))
+                                               matrices.gamma -= 0.1f;
+                                       else
+                                               matrices.gamma += 0.1f;
+                                       break;
+                               case Key.F3:
+                                       if (camera.Type == CamType.FirstPerson)
+                                               camera.Type = CamType.LookAt;
+                                       else
+                                               camera.Type = CamType.FirstPerson;
+                                       break;
+                               default:
+                                       base.onKeyDown (key, scanCode, modifiers);
+                                       return;
+                       }
+                       updateViewRequested = true;
+               }
+               #endregion
+
+               protected override void OnResize () {
+
+                       vkvgImage?.Dispose ();
+                       vkvgSurf?.Dispose ();
+                       vkvgSurf = new vkvg.Surface (vkvgDev, (int)swapChain.Width, (int)swapChain.Height);
+                       vkvgImage = new Image (dev, new VkImage ((ulong)vkvgSurf.VkImage.ToInt64 ()), VkFormat.B8g8r8a8Unorm,
+                               VkImageUsageFlags.ColorAttachment, (uint)vkvgSurf.Width, (uint)vkvgSurf.Height);
+                       vkvgImage.CreateView (VkImageViewType.ImageView2D, VkImageAspectFlags.Color);
+                       vkvgImage.CreateSampler (VkFilter.Nearest,VkFilter.Nearest, VkSamplerMipmapMode.Nearest, VkSamplerAddressMode.ClampToBorder);
+
+                       vkvgImage.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (dsMats, descLayoutMatrix.Bindings[1]);                         
+                       uboUpdate.Write (dev, vkvgImage.Descriptor);
+
+                       updateMatrices ();
+
+                       if (frameBuffers!=null)
+                               for (int i = 0; i < swapChain.ImageCount; ++i)
+                                       frameBuffers[i]?.Dispose ();
+
+                       frameBuffers = new Framebuffer[swapChain.ImageCount];
+
+                       for (int i = 0; i < swapChain.ImageCount; ++i) {
+                               frameBuffers[i] = new Framebuffer (pipeline.RenderPass, swapChain.Width, swapChain.Height,
+                                       (pipeline.Samples == VkSampleCountFlags.SampleCount1) ? new Image[] {
+                                               swapChain.images[i],
+                                               null
+                                       } : new Image[] {
+                                               null,
+                                               null,
+                                               swapChain.images[i]
+                                       });
+                               frameBuffers[i].SetName ("main FB " + i);
+
+                       }
+
+                       buildCommandBuffers ();
+               }       
+
+               protected override void Dispose (bool disposing) {
+                       if (disposing) {
+                               if (!isDisposed) {
+                                       dev.WaitIdle ();
+                                       for (int i = 0; i < swapChain.ImageCount; ++i)
+                                               frameBuffers[i]?.Dispose ();
+                                       model.Dispose ();
+                                       pipeline.Dispose ();
+                                       descLayoutMatrix.Dispose ();
+                                       descLayoutTextures.Dispose ();
+                                       descriptorPool.Dispose ();
+
+                                       uboMats.Dispose ();
+
+                                       vkvgSurf?.Dispose ();
+                                       vkvgDev.Dispose ();
+
+                                       timestampQPool.Dispose ();
+                                       statPool.Dispose ();
+                               }
+                       }
+
+                       base.Dispose (disposing);
+               }
+       }
+}
diff --git a/samples/RayTests/shaders/GBuffPbr.vert b/samples/RayTests/shaders/GBuffPbr.vert
new file mode 100644 (file)
index 0000000..7cafe49
--- /dev/null
@@ -0,0 +1,37 @@
+#version 450
+
+layout (location = 0) in vec3 inPos;
+layout (location = 1) in vec3 inNormal;
+layout (location = 2) in vec2 inUV0;
+layout (location = 3) in vec2 inUV1;
+
+layout (set = 0, binding = 0) uniform UBO {
+    mat4 projection;
+    mat4 model;
+    mat4 view;    
+} ubo;
+
+layout(push_constant) uniform PushConsts {
+    mat4 model;
+} pc;
+
+layout (location = 0) out vec3 outWorldPos;
+layout (location = 1) out vec3 outNormal;
+layout (location = 2) out vec2 outUV0;
+layout (location = 3) out vec2 outUV1;
+
+out gl_PerVertex
+{
+    vec4 gl_Position;
+};
+
+void main() 
+{        
+    vec4 locPos = ubo.model * pc.model * vec4(inPos, 1.0);
+    outNormal = normalize(transpose(inverse(mat3(ubo.model * pc.model))) * inNormal);        
+        
+    outWorldPos = locPos.xyz;
+    outUV0 = inUV0;
+    outUV1 = inUV1;
+    gl_Position =  ubo.projection * ubo.view * vec4(outWorldPos, 1.0);
+}
diff --git a/samples/RayTests/shaders/GBuffPbrCommon.inc b/samples/RayTests/shaders/GBuffPbrCommon.inc
new file mode 100644 (file)
index 0000000..a56e65c
--- /dev/null
@@ -0,0 +1,56 @@
+layout (constant_id = 0) const float NEAR_PLANE = 0.1f;
+layout (constant_id = 1) const float FAR_PLANE = 256.0f;
+layout (constant_id = 2) const int MAT_COUNT = 1;
+
+const float M_PI = 3.141592653589793;
+const float c_MinRoughness = 0.04;
+
+const float PBR_WORKFLOW_METALLIC_ROUGHNESS = 1.0;
+const float PBR_WORKFLOW_SPECULAR_GLOSINESS = 2.0f;
+
+const uint MAP_COLOR = 0x1;
+const uint MAP_NORMAL = 0x2;
+const uint MAP_AO = 0x4;
+const uint MAP_METAL = 0x8;
+const uint MAP_ROUGHNESS = 0x10;
+const uint MAP_METALROUGHNESS = 0x20;
+const uint MAP_EMISSIVE = 0x40;
+
+layout (location = 0) in vec3 inWorldPos;
+layout (location = 1) in vec3 inNormal;
+layout (location = 2) in vec2 inUV0;
+layout (location = 3) in vec2 inUV1;
+
+layout (set = 1, binding = 0) uniform UBOMaterials {
+    Material materials[MAT_COUNT];
+};
+
+layout (push_constant) uniform PushCsts {
+    layout(offset = 64)
+    int materialIdx;
+};
+
+layout (location = 0) out vec4 outColorRough;
+layout (location = 1) out vec4 outEmitMetal;
+layout (location = 2) out vec4 outN_AO;
+layout (location = 3) out vec4 outPos;
+
+// Gets metallic factor from specular glossiness workflow inputs 
+float convertMetallic(vec3 diffuse, vec3 specular, float maxSpecular) {
+    float perceivedDiffuse = sqrt(0.299 * diffuse.r * diffuse.r + 0.587 * diffuse.g * diffuse.g + 0.114 * diffuse.b * diffuse.b);
+    float perceivedSpecular = sqrt(0.299 * specular.r * specular.r + 0.587 * specular.g * specular.g + 0.114 * specular.b * specular.b);
+    if (perceivedSpecular < c_MinRoughness) {
+        return 0.0;
+    }
+    float a = c_MinRoughness;
+    float b = perceivedDiffuse * (1.0 - maxSpecular) / (1.0 - c_MinRoughness) + perceivedSpecular - 2.0 * c_MinRoughness;
+    float c = c_MinRoughness - perceivedSpecular;
+    float D = max(b * b - 4.0 * a * c, 0.0);
+    return clamp((-b + sqrt(D)) / (2.0 * a), 0.0, 1.0);
+}
+
+float linearDepth(float depth)
+{
+    float z = depth * 2.0f - 1.0f; 
+    return (2.0f * NEAR_PLANE * FAR_PLANE) / (FAR_PLANE + NEAR_PLANE - z * (FAR_PLANE - NEAR_PLANE));   
+}
\ No newline at end of file
diff --git a/samples/RayTests/shaders/GBuffPbrTexArray.frag b/samples/RayTests/shaders/GBuffPbrTexArray.frag
new file mode 100644 (file)
index 0000000..7334609
--- /dev/null
@@ -0,0 +1,142 @@
+#version 450
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+#define MANUAL_SRGB 0
+
+struct Material {
+    vec4 baseColorFactor;
+    vec4 emissiveFactor;
+    vec4 diffuseFactor;
+    vec4 specularFactor;
+    
+    float workflow;    
+    uint tex0;    
+    uint tex1;    
+    int baseColorTex;
+    
+    int physicalDescTex;    
+    int normalTex;
+    int occlusionTex;
+    int emissiveTex;
+    
+    float metallicFactor;       
+    float roughnessFactor;  
+    float alphaMask;    
+    float alphaMaskCutoff;    
+};
+
+#include "GBuffPbrCommon.inc"
+#include "tonemap.inc"
+
+layout (set = 1, binding = 1) uniform sampler2DArray texArray;
+
+// Find the normal for this fragment, pulling either from a predefined normal map
+// or from the interpolated mesh normal and tangent attributes.
+vec3 getNormal()
+{
+    vec3 tangentNormal;
+    // Perturb normal, see http://www.thetenthplanet.de/archives/1180
+    if ((materials[materialIdx].tex0 & MAP_NORMAL) == MAP_NORMAL)
+        tangentNormal = texture(texArray, vec3(inUV0, materials[materialIdx].normalTex)).xyz * 2.0 - 1.0;
+    else if ((materials[materialIdx].tex1 & MAP_NORMAL) == MAP_NORMAL)
+        tangentNormal = texture(texArray, vec3(inUV1, materials[materialIdx].normalTex)).xyz * 2.0 - 1.0;
+    else
+        return normalize(inNormal);
+        
+    vec3 q1 = dFdx(inWorldPos);
+    vec3 q2 = dFdy(inWorldPos);
+    vec2 st1 = dFdx(inUV0);
+    vec2 st2 = dFdy(inUV0);
+
+    vec3 N = normalize(inNormal);
+    vec3 T = normalize(q1 * st2.t - q2 * st1.t);
+    vec3 B = -normalize(cross(N, T));
+    mat3 TBN = mat3(T, B, N);
+
+    return normalize(TBN * tangentNormal);
+}
+
+void main() 
+{
+    float perceptualRoughness;
+    float metallic;    
+    vec4 baseColor;
+    vec3 emissive = vec3(0);    
+    
+    baseColor = materials[materialIdx].baseColorFactor;
+    
+    if (materials[materialIdx].workflow == PBR_WORKFLOW_METALLIC_ROUGHNESS) {
+        perceptualRoughness = materials[materialIdx].roughnessFactor;
+        metallic = materials[materialIdx].metallicFactor;        
+        // Roughness is stored in the 'g' channel, metallic is stored in the 'b' channel.
+        // This layout intentionally reserves the 'r' channel for (optional) occlusion map data
+        if ((materials[materialIdx].tex0 & MAP_METALROUGHNESS) == MAP_METALROUGHNESS){
+            perceptualRoughness *= texture(texArray, vec3(inUV0, materials[materialIdx].physicalDescTex)).g;            
+            metallic *= texture(texArray, vec3(inUV0, materials[materialIdx].physicalDescTex)).b;
+        }else if ((materials[materialIdx].tex1 & MAP_METALROUGHNESS) == MAP_METALROUGHNESS){
+            perceptualRoughness *= texture(texArray, vec3(inUV1, materials[materialIdx].physicalDescTex)).g;            
+            metallic *= texture(texArray, vec3(inUV1, materials[materialIdx].physicalDescTex)).b;
+        }               
+        perceptualRoughness = clamp(perceptualRoughness, c_MinRoughness, 1.0);
+        metallic = clamp(metallic, 0.0, 1.0);        
+
+        // The albedo may be defined from a base texture or a flat color
+        if ((materials[materialIdx].tex0 & MAP_COLOR) == MAP_COLOR)        
+            baseColor *= SRGBtoLINEAR(texture(texArray, vec3(inUV0, materials[materialIdx].baseColorTex)));
+        else if ((materials[materialIdx].tex1 & MAP_COLOR) == MAP_COLOR)
+            baseColor *= SRGBtoLINEAR(texture(texArray, vec3(inUV1, materials[materialIdx].baseColorTex)));
+    }
+    
+    if (materials[materialIdx].alphaMask == 1.0f) {            
+        if (baseColor.a < materials[materialIdx].alphaMaskCutoff) 
+            discard;        
+    }
+
+    if (materials[materialIdx].workflow == PBR_WORKFLOW_SPECULAR_GLOSINESS) {
+        // Values from specular glossiness workflow are converted to metallic roughness
+        if ((materials[materialIdx].tex0 & MAP_METALROUGHNESS) == MAP_METALROUGHNESS)
+            perceptualRoughness = 1.0 - texture(texArray, vec3(inUV0, materials[materialIdx].physicalDescTex)).a;            
+        else if ((materials[materialIdx].tex1 & MAP_METALROUGHNESS) == MAP_METALROUGHNESS)
+            perceptualRoughness = 1.0 - texture(texArray, vec3(inUV1, materials[materialIdx].physicalDescTex)).a;            
+        else
+            perceptualRoughness = 0.0;
+
+        const float epsilon = 1e-6;
+
+        vec4 diffuse = SRGBtoLINEAR(texture(texArray, vec3(inUV0, materials[materialIdx].baseColorTex)));
+        vec3 specular = SRGBtoLINEAR(texture(texArray, vec3(inUV0, materials[materialIdx].physicalDescTex))).rgb;
+
+        float maxSpecular = max(max(specular.r, specular.g), specular.b);
+
+        // Convert metallic value from specular glossiness inputs
+        metallic = convertMetallic(diffuse.rgb, specular, maxSpecular);
+
+        vec3 baseColorDiffusePart = diffuse.rgb * ((1.0 - maxSpecular) / (1 - c_MinRoughness) / max(1 - metallic, epsilon)) * materials[materialIdx].diffuseFactor.rgb;
+        vec3 baseColorSpecularPart = specular - (vec3(c_MinRoughness) * (1 - metallic) * (1 / max(metallic, epsilon))) * materials[materialIdx].specularFactor.rgb;
+        baseColor = vec4(mix(baseColorDiffusePart, baseColorSpecularPart, metallic * metallic), diffuse.a);
+
+    }        
+    
+    const float u_OcclusionStrength = 1.0f;
+    const float u_EmissiveFactor = 1.0f;
+    float ao = 1.0f;
+    
+    if ((materials[materialIdx].tex0 & MAP_EMISSIVE) == MAP_EMISSIVE)    
+        emissive = SRGBtoLINEAR(texture(texArray, vec3(inUV0, materials[materialIdx].emissiveTex))).rgb * u_EmissiveFactor;
+    else if ((materials[materialIdx].tex1 & MAP_EMISSIVE) == MAP_EMISSIVE)    
+        emissive = SRGBtoLINEAR(texture(texArray, vec3(inUV1, materials[materialIdx].emissiveTex))).rgb * u_EmissiveFactor;
+    
+    if ((materials[materialIdx].tex0 & MAP_AO) == MAP_AO)
+        ao = texture(texArray, vec3(inUV0, materials[materialIdx].occlusionTex)).r;
+    else if ((materials[materialIdx].tex1 & MAP_AO) == MAP_AO)
+        ao = texture(texArray, vec3(inUV1, materials[materialIdx].occlusionTex)).r;
+        
+    vec3 n = getNormal();    
+    vec3 p = inWorldPos;
+    
+    outColorRough = vec4 (baseColor.rgb, perceptualRoughness);
+    outEmitMetal = vec4 (emissive, metallic);
+    outN_AO = vec4 (n, ao);
+    outPos = vec4 (p, linearDepth(gl_FragCoord.z));
+}
\ No newline at end of file
diff --git a/samples/RayTests/shaders/compose.frag b/samples/RayTests/shaders/compose.frag
new file mode 100644 (file)
index 0000000..64c8e48
--- /dev/null
@@ -0,0 +1,158 @@
+#include "preamble.inc"
+
+layout (set = 0, binding = 0) uniform UBO {
+    mat4 projection;
+    mat4 model;
+    mat4 view;
+    vec4 camPos;    
+    float exposure;
+    float gamma;
+    float prefilteredCubeMipLevels;
+    float scaleIBLAmbient;
+} ubo;
+
+layout (constant_id = 0) const uint NUM_LIGHTS = 1;
+
+struct Light {
+    vec4 position;
+    vec4 color;
+    mat4 mvp;
+};
+
+layout (set = 1, binding = 7) uniform UBOLights {
+    Light lights[NUM_LIGHTS];
+};
+
+const float M_PI = 3.141592653589793;
+const float c_MinRoughness = 0.04;
+
+layout (set = 1, binding = 0) uniform sampler2D samplerColorRough;
+layout (set = 1, binding = 1) uniform sampler2D samplerEmitMetal;
+layout (set = 1, binding = 2) uniform sampler2D samplerN_AO;
+layout (set = 1, binding = 3) uniform sampler2D samplerPos;
+
+layout (set = 1, binding = 4) uniform samplerCube samplerIrradiance;
+layout (set = 1, binding = 5) uniform samplerCube prefilteredMap;
+layout (set = 1, binding = 6) uniform sampler2D samplerBRDFLUT;
+
+layout (location = 0) in vec2 inUV;
+
+layout (location = 0) out vec4 outColor;
+
+#include "pbr.inc"
+#include "tonemap.inc"
+
+// Calculation of the lighting contribution from an optional Image Based Light source.
+// Precomputed Environment Maps are required uniform inputs and are computed as outlined in [1].
+// See our README.md on Environment Maps [3] for additional discussion.
+vec3 getIBLContribution(PBRInfo pbrInputs, vec3 n, vec3 reflection)
+{
+    float lod = (pbrInputs.perceptualRoughness * ubo.prefilteredCubeMipLevels);
+    // retrieve a scale and bias to F0. See [1], Figure 3
+    vec3 brdf = (texture(samplerBRDFLUT, vec2(pbrInputs.NdotV, 1.0 - pbrInputs.perceptualRoughness))).rgb;
+    vec3 diffuseLight = texture(samplerIrradiance, reflection).rgb;
+
+    vec3 specularLight = textureLod(prefilteredMap, reflection, lod).rgb;
+
+    vec3 diffuse = diffuseLight * pbrInputs.diffuseColor;
+    vec3 specular = specularLight * (pbrInputs.specularColor * brdf.x + brdf.y);
+
+    // For presentation, this allows us to disable IBL terms
+    // For presentation, this allows us to disable IBL terms
+    diffuse *= ubo.scaleIBLAmbient;
+    specular *= ubo.scaleIBLAmbient;
+
+    return diffuse + specular;
+}
+
+void main() 
+{
+    if (texture(samplerPos, inUV).a == 1.0f)
+        discard;
+    
+    float perceptualRoughness = texture(samplerColorRough, inUV).a;
+    float metallic = texture(samplerEmitMetal, inUV).a;
+    vec3 diffuseColor;
+    vec4 baseColor = vec4(texture(samplerColorRough, inUV).rgb, 1);    
+    vec3 emissive = texture (samplerEmitMetal, inUV).rgb;        
+
+    vec3 f0 = vec3(0.04);
+    
+    diffuseColor = baseColor.rgb * (vec3(1.0) - f0);
+    diffuseColor *= 1.0 - metallic;
+        
+    float alphaRoughness = perceptualRoughness * perceptualRoughness;
+
+    vec3 specularColor = mix(f0, baseColor.rgb, metallic);
+
+    // Compute reflectance.
+    float reflectance = max(max(specularColor.r, specularColor.g), specularColor.b);
+
+    // For typical incident reflectance range (between 4% to 100%) set the grazing reflectance to 100% for typical fresnel effect.
+    // For very low reflectance range on highly diffuse objects (below 4%), incrementally reduce grazing reflecance to 0%.
+    float reflectance90 = clamp(reflectance * 25.0, 0.0, 1.0);
+    vec3 specularEnvironmentR0 = specularColor.rgb;
+    vec3 specularEnvironmentR90 = vec3(1.0) * reflectance90;
+
+    vec3 n = texture(samplerN_AO, inUV).rgb;
+    vec3 pos = texture(samplerPos, inUV).rgb;
+    vec3 v = normalize(ubo.camPos.xyz - pos); // Vector from surface point to camera
+    
+    vec3 colors = vec3(0);
+    vec3 lightTarget = vec3(0);
+    
+    for (int i=0; i<NUM_LIGHTS; i++) {
+    
+        vec3 l = normalize(lights[i].position.xyz-pos);     // Vector from surface point to light
+        vec3 h = normalize(l+v);                        // Half vector between both l and v
+        vec3 reflection = -normalize(reflect(v, n));
+        reflection.y *= -1.0f;
+
+        float NdotL = clamp(dot(n, l), 0.001, 1.0);
+        float NdotV = clamp(abs(dot(n, v)), 0.001, 1.0);
+        float NdotH = clamp(dot(n, h), 0.0, 1.0);
+        float LdotH = clamp(dot(l, h), 0.0, 1.0);
+        float VdotH = clamp(dot(v, h), 0.0, 1.0);
+
+        PBRInfo pbrInputs = PBRInfo(
+            NdotL,
+            NdotV,
+            NdotH,
+            LdotH,
+            VdotH,
+            perceptualRoughness,
+            metallic,
+            specularEnvironmentR0,
+            specularEnvironmentR90,
+            alphaRoughness,
+            diffuseColor,
+            specularColor
+        );
+
+        // Calculate the shading terms for the microfacet specular shading model
+        vec3 F = specularReflection(pbrInputs);
+        float G = geometricOcclusion(pbrInputs);
+        float D = microfacetDistribution(pbrInputs);
+
+        // Calculation of analytical lighting contribution
+        vec3 diffuseContrib = (1.0 - F) * diffuse(pbrInputs);
+        vec3 specContrib = F * G * D / (4.0 * NdotL * NdotV);        
+        // Obtain final intensity as reflectance (BRDF) scaled by the energy of the light (cosine law)
+        vec3 color = NdotL * lights[i].color.rgb * (diffuseContrib + specContrib);
+        // Calculate lighting contribution from image based lighting source (IBL)
+        colors += (color + getIBLContribution(pbrInputs, n, reflection));
+        
+        
+    }
+    colors /= NUM_LIGHTS;
+    
+    
+    const float u_OcclusionStrength = 1.0f;
+    const float u_EmissiveFactor = 1.0f;
+    
+    //AO is in the alpha channel of the normalAttachment    
+    colors = mix(colors, colors * texture(samplerN_AO, inUV).a, u_OcclusionStrength);
+    colors += emissive;             
+        
+    outColor = tonemap(vec4(colors, baseColor.a), ubo.exposure, ubo.gamma);
+}
\ No newline at end of file
diff --git a/samples/RayTests/shaders/debug.frag b/samples/RayTests/shaders/debug.frag
new file mode 100644 (file)
index 0000000..fd419ff
--- /dev/null
@@ -0,0 +1,12 @@
+#version 450
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (location = 0) in vec3 inColor;
+layout (location = 0) out vec4 outFragColor;
+
+void main() 
+{
+  outFragColor = vec4(inColor, 1.0);
+}
\ No newline at end of file
diff --git a/samples/RayTests/shaders/debug.vert b/samples/RayTests/shaders/debug.vert
new file mode 100644 (file)
index 0000000..180e58e
--- /dev/null
@@ -0,0 +1,34 @@
+#version 450
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (location = 0) in vec3 inPos;
+layout (location = 1) in vec3 inColor;
+
+layout (location = 0) out vec3 outColor;
+
+layout (binding = 0) uniform UBO 
+{
+    mat4 projectionMatrix;
+    mat4 viewMatrix;
+    mat4 modelMatrix;    
+    float gamma;
+    float exposure;    
+} ubo;
+
+layout(push_constant) uniform PushConsts {
+    mat4 projectionMatrix;
+} pc;
+
+out gl_PerVertex 
+{
+    vec4 gl_Position;   
+};
+
+void main() 
+{
+    outColor = inColor;
+    
+       gl_Position = pc.projectionMatrix * vec4 ((ubo.viewMatrix * vec4(inPos.xyz, 0.0)).xyz, 1);
+}
diff --git a/samples/RayTests/shaders/emissive.frag b/samples/RayTests/shaders/emissive.frag
new file mode 100644 (file)
index 0000000..2efe331
--- /dev/null
@@ -0,0 +1,25 @@
+#version 450
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (input_attachment_index = 0, set = 2, binding = 0) uniform subpassInputMS samplerColorRough;
+layout (input_attachment_index = 1, set = 2, binding = 1) uniform subpassInputMS samplerEmitMetal;
+layout (input_attachment_index = 2, set = 2, binding = 2) uniform subpassInputMS samplerN_AO;
+layout (input_attachment_index = 3, set = 2, binding = 3) uniform subpassInputMS samplerPos;
+
+layout (location = 0) in vec2 inUV;
+
+layout (location = 0) out vec4 outColor;
+
+const float offset[5] = float[](0.0, 1.0, 2.0, 3.0, 4.0);
+const float weight[5] = float[](0.2270270270, 0.1945945946, 0.1216216216,
+                                  0.0540540541, 0.0162162162);
+void main() 
+{
+    if (subpassLoad(samplerPos, gl_SampleID).a == 1.0f)
+        discard;
+    vec3 emissive = subpassLoad (samplerEmitMetal, gl_SampleID).rgb;        
+        
+    outColor = vec4(emissive, 1);
+}
\ No newline at end of file
diff --git a/samples/RayTests/shaders/show_gbuff.frag b/samples/RayTests/shaders/show_gbuff.frag
new file mode 100644 (file)
index 0000000..7859e36
--- /dev/null
@@ -0,0 +1,92 @@
+#version 450
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (input_attachment_index = 0, set = 1, binding = 0) uniform subpassInputMS samplerColorRough;
+layout (input_attachment_index = 1, set = 1, binding = 1) uniform subpassInputMS samplerEmitMetal;
+layout (input_attachment_index = 2, set = 1, binding = 2) uniform subpassInputMS samplerN_AO;
+layout (input_attachment_index = 3, set = 1, binding = 3) uniform subpassInputMS samplerPos;
+
+layout (set = 0, binding = 1) uniform samplerCube samplerIrradiance;
+layout (set = 0, binding = 2) uniform samplerCube prefilteredMap;
+layout (set = 0, binding = 3) uniform sampler2D samplerBRDFLUT;
+layout (set = 0, binding = 6) uniform sampler2DArray samplerShadowMap;
+
+layout (push_constant) uniform PushCsts {
+    layout(offset = 64)
+    int imgIdx;
+};
+
+layout (location = 0) in vec2 inUV;
+layout (location = 0) out vec4 outColor;
+
+const uint color        = 0;
+const uint normal       = 1;
+const uint pos          = 2;
+const uint occlusion    = 3;
+const uint emissive     = 4;
+const uint metallic     = 5;
+const uint roughness    = 6;
+const uint depth        = 7;
+const uint prefill      = 8;
+const uint irradiance   = 9;
+const uint shadowMap    = 10;
+
+vec4 sampleCubeMap (samplerCube sc, uint face, uint lod) {
+    vec2 uv = 2.0 * inUV - vec2(1.0);
+    switch (face) {
+        case 0:
+            return vec4 (textureLod (sc, vec3(1, uv.t, uv.s), lod).rgb, 1);
+        case 1:
+            return vec4 (textureLod (sc, vec3(-1, uv.t, uv.s), lod).rgb, 1);
+        case 2:
+            return vec4 (textureLod (sc, vec3(uv.s, 1, -uv.t), lod).rgb, 1);
+        case 3:
+            return vec4 (textureLod (sc, vec3(uv.s, -1, uv.t), lod).rgb, 1);
+        case 4:
+            return vec4 (textureLod (sc, vec3(uv, 1), lod).rgb, 1);
+        case 5:
+            return vec4 (textureLod (sc, vec3(-uv.s, uv.t, -1), lod).rgb, 1);
+   }
+}
+
+void main() 
+{
+    uint imgNum = bitfieldExtract (imgIdx, 0, 8);
+    switch (imgNum) {
+        case color:
+            outColor = vec4(subpassLoad(samplerColorRough, gl_SampleID).rgb, 1);
+            break;
+        case normal:
+            outColor = vec4(subpassLoad(samplerN_AO, gl_SampleID).rgb, 1);
+            break;
+        case pos:
+            outColor = vec4(subpassLoad(samplerPos, gl_SampleID).rgb, 1);
+            break;
+        case occlusion:
+            outColor = vec4(subpassLoad(samplerN_AO, gl_SampleID).aaa, 1);
+            break;
+        case emissive:
+            outColor = vec4(subpassLoad(samplerEmitMetal, gl_SampleID).rgb, 1);
+            break;
+        case metallic:
+            outColor = vec4(subpassLoad(samplerEmitMetal, gl_SampleID).aaa, 1);
+            break;
+        case roughness:
+            outColor = vec4(subpassLoad(samplerColorRough, gl_SampleID).aaa, 1);
+            break;
+        case depth:
+            outColor = vec4(subpassLoad(samplerPos, gl_SampleID).aaa, 1);
+            break;
+        case shadowMap:            
+            vec3 d = texture(samplerShadowMap, vec3(inUV, bitfieldExtract (imgIdx, 8, 8))).rrr;
+            outColor = vec4(d*d*d, 1);
+            break;
+        default:
+            if (imgNum == prefill)
+                outColor = sampleCubeMap (prefilteredMap, bitfieldExtract (imgIdx, 8, 8), bitfieldExtract (imgIdx, 16, 8));            
+            else if (imgNum == irradiance)
+                outColor = sampleCubeMap (samplerIrradiance, bitfieldExtract (imgIdx, 8, 8), bitfieldExtract (imgIdx, 16, 8));            
+            break;
+    }
+}
\ No newline at end of file
diff --git a/samples/RayTests/shaders/simpletexture.frag b/samples/RayTests/shaders/simpletexture.frag
new file mode 100644 (file)
index 0000000..a081876
--- /dev/null
@@ -0,0 +1,15 @@
+#version 450
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (set = 0, binding = 0) uniform sampler2D samplerColor;
+
+layout (location = 0) in       vec2 inUV;
+
+layout (location = 0) out      vec4 outFragColor;
+
+void main()
+{    
+       outFragColor = texture(samplerColor, inUV);
+}
diff --git a/samples/RayTests/shaders/skybox.frag b/samples/RayTests/shaders/skybox.frag
new file mode 100644 (file)
index 0000000..9290579
--- /dev/null
@@ -0,0 +1,12 @@
+#version 450
+
+layout (set = 1, binding = 5) uniform samplerCube samplerEnv;
+
+layout (set = 0, location = 0) in vec3 inUVW;
+
+layout (set = 0, location = 0) out vec4 outColor;
+
+void main() 
+{    
+    outColor = vec4(textureLod(samplerEnv, inUVW, 1.5).rgb, 1.0);
+}
\ No newline at end of file
diff --git a/samples/RayTests/shadowMapRenderer.cs b/samples/RayTests/shadowMapRenderer.cs
new file mode 100644 (file)
index 0000000..f247411
--- /dev/null
@@ -0,0 +1,157 @@
+/*shadow mapping greatly inspired from:
+* Vulkan Example - Deferred shading with shadows from multiple light sources using geometry shader instancing
+* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de
+* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+*/
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using vke;
+using vke.glTF;
+using Vulkan;
+using static deferred.DeferredPbrRenderer;
+
+namespace deferred {
+       public class ShadowMapRenderer : IDisposable {
+               Device dev;
+               Queue gQueue;
+
+               public static uint SHADOWMAP_SIZE = 4096;
+               public static VkFormat SHADOWMAP_FORMAT = VkFormat.D32SfloatS8Uint;
+               public static VkSampleCountFlags SHADOWMAP_NUM_SAMPLES = VkSampleCountFlags.SampleCount1;
+               public bool updateShadowMap = true;
+
+               public float depthBiasConstant = 1.5f;
+               public float depthBiasSlope = 1.75f;
+               float lightFOV = Utils.DegreesToRadians (60);
+               float lightFarPlane;
+
+
+
+               RenderPass shadowPass;
+               FrameBuffer fbShadowMap;
+               public Image shadowMap { get; private set; }
+               Pipeline shadowPipeline;
+               DescriptorPool descriptorPool;
+               DescriptorSetLayout descLayoutShadow;
+               DescriptorSet dsShadow;
+               DeferredPbrRenderer renderer;
+
+               public ShadowMapRenderer (Queue gQueue, DeferredPbrRenderer renderer, float farPlane = 16f) {
+                       this.lightFarPlane = farPlane;
+                       this.gQueue = gQueue;
+                       this.dev = gQueue.Dev;
+                       this.renderer = renderer;
+
+                       descriptorPool = new DescriptorPool (dev, 1,
+                               new VkDescriptorPoolSize (VkDescriptorType.UniformBuffer, 2)
+                       );
+
+                       init ();
+               }
+
+               void init () {
+
+                       //Shadow map renderpass
+                       shadowPass = new RenderPass (dev, VkSampleCountFlags.SampleCount1);
+                       shadowPass.AddAttachment (SHADOWMAP_FORMAT, VkImageLayout.DepthStencilReadOnlyOptimal, SHADOWMAP_NUM_SAMPLES);
+                       shadowPass.ClearValues.Add (new VkClearValue { depthStencil = new VkClearDepthStencilValue (1.0f, 0) });
+
+                       SubPass subpass0 = new SubPass ();
+                       subpass0.SetDepthReference (0);
+                       shadowPass.AddSubpass (subpass0);
+
+                       shadowPass.AddDependency (Vk.SubpassExternal, 0,
+                               VkPipelineStageFlags.FragmentShader, VkPipelineStageFlags.EarlyFragmentTests,
+                               VkAccessFlags.ShaderRead, VkAccessFlags.DepthStencilAttachmentWrite);
+                       shadowPass.AddDependency (0, Vk.SubpassExternal,
+                               VkPipelineStageFlags.LateFragmentTests, VkPipelineStageFlags.FragmentShader,
+                               VkAccessFlags.DepthStencilAttachmentWrite, VkAccessFlags.ShaderRead);
+
+                       descLayoutShadow = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Geometry, VkDescriptorType.UniformBuffer),//matrices
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Geometry, VkDescriptorType.UniformBuffer));//lights
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList);
+                       cfg.rasterizationState.cullMode = VkCullModeFlags.Back;
+                       cfg.rasterizationState.depthBiasEnable = true;
+                       cfg.dynamicStates.Add (VkDynamicState.DepthBias);
+
+                       cfg.RenderPass = shadowPass;
+
+                       cfg.Layout = new PipelineLayout (dev, descLayoutShadow);
+                       cfg.Layout.AddPushConstants (
+                               new VkPushConstantRange (VkShaderStageFlags.Vertex|VkShaderStageFlags.Geometry, (uint)Marshal.SizeOf<Matrix4x4> ())
+                       );
+
+                       cfg.AddVertexBinding<PbrModel.Vertex> (0);
+                       cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat);
+
+                       cfg.AddShader (VkShaderStageFlags.Vertex, "#RayTests.shadow.vert.spv");
+                       cfg.AddShader (VkShaderStageFlags.Geometry, "#RayTests.shadow.geom.spv");
+
+                       shadowPipeline = new GraphicPipeline (cfg);
+
+                       //shadow map image
+                       shadowMap = new Image (dev, SHADOWMAP_FORMAT, VkImageUsageFlags.DepthStencilAttachment | VkImageUsageFlags.Sampled, VkMemoryPropertyFlags.DeviceLocal, SHADOWMAP_SIZE, SHADOWMAP_SIZE,
+                               VkImageType.Image2D, SHADOWMAP_NUM_SAMPLES, VkImageTiling.Optimal, 1, (uint)renderer.lights.Length);
+                       shadowMap.CreateView (VkImageViewType.ImageView2DArray, VkImageAspectFlags.Depth, shadowMap.CreateInfo.arrayLayers);
+                       shadowMap.CreateSampler (VkSamplerAddressMode.ClampToBorder);
+                       shadowMap.Descriptor.imageLayout = VkImageLayout.DepthStencilReadOnlyOptimal;
+
+                       fbShadowMap = new FrameBuffer (shadowPass, SHADOWMAP_SIZE, SHADOWMAP_SIZE, (uint)renderer.lights.Length);
+                       fbShadowMap.attachments.Add (shadowMap);
+                       fbShadowMap.Activate ();
+
+                       dsShadow = descriptorPool.Allocate (descLayoutShadow);
+
+                       DescriptorSetWrites dsWrite = new DescriptorSetWrites (dsShadow, descLayoutShadow);
+                       dsWrite.Write (dev, renderer.uboMatrices.Descriptor, renderer.uboLights.Descriptor);
+               }
+
+               public void update_light_matrices () {
+                       Matrix4x4 proj = Matrix4x4.CreatePerspectiveFieldOfView (lightFOV, 1, 0.1f, lightFarPlane);
+                       for (int i = 0; i < renderer.lights.Length; i++) {
+                               Matrix4x4 view = Matrix4x4.CreateLookAt (renderer.lights[i].position.ToVector3 (), Vector3.Zero, Vector3.UnitY);
+                               renderer.lights[i].mvp = view * proj;
+                       }
+                       renderer.uboLights.Update (renderer.lights);
+                       dev.WaitIdle ();
+               }
+
+               public void update_shadow_map (CommandPool cmdPool) {
+                       update_light_matrices ();
+
+                       CommandBuffer cmd = cmdPool.AllocateAndStart ();
+
+                       shadowPass.Begin (cmd, fbShadowMap);
+
+                       cmd.SetViewport (SHADOWMAP_SIZE, SHADOWMAP_SIZE);
+                       cmd.SetScissor (SHADOWMAP_SIZE, SHADOWMAP_SIZE);
+
+                       cmd.BindDescriptorSet (shadowPipeline.Layout, dsShadow);
+
+                       Vk.vkCmdSetDepthBias (cmd.Handle, depthBiasConstant, 0.0f, depthBiasSlope);
+
+                       shadowPipeline.Bind (cmd);
+
+                       if (renderer.model != null) {
+                               renderer.model.Bind (cmd);
+                               renderer.model.DrawAll (cmd, shadowPipeline.Layout, true);
+                       }
+
+                       shadowPass.End (cmd);
+
+                       gQueue.EndSubmitAndWait (cmd);
+                       updateShadowMap = false;
+               }
+
+
+               public void Dispose () {
+                       shadowPipeline?.Dispose ();
+                       fbShadowMap?.Dispose ();
+                       shadowMap?.Dispose ();
+                       descriptorPool?.Dispose ();
+               }
+       }
+}
diff --git a/samples/RayTests/ui/debug.crow b/samples/RayTests/ui/debug.crow
new file mode 100644 (file)
index 0000000..4d78bf1
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<Window Caption="Debug" Icon="#deferred.crow.svg" Left="10" Top="100" Width="40%" Height="50%">
+    <VerticalStack Spacing="1" Margin="10" CacheEnabled="true">     
+        <HorizontalStack Height="Fit">
+            <Label Text="Fps:" Width="80"/>            
+            <Label Text="{fps}" Width="Stretched" TextAlignment="Center"/>    
+        </HorizontalStack>       
+        <Expandable Caption="Debug Views">
+            <EnumSelector Left="20" EnumValue="{²CurrentDebugView}" Width="50%"/>        
+        </Expandable>
+    </VerticalStack>
+</Window>
+
diff --git a/samples/RayTests/ui/deferred.style b/samples/RayTests/ui/deferred.style
new file mode 100644 (file)
index 0000000..c21ffb6
--- /dev/null
@@ -0,0 +1,61 @@
+icon {
+       Width="14";
+       Height="14";
+}
+MemberViewLabel {
+       Margin="1";
+       Height="Fit";
+       Width="50%";
+       Background="White";
+}
+MemberViewHStack {
+       Focusable="true";
+       Height="Fit";
+       Spacing="1";
+       MouseEnter="{Background=SteelBlue}";
+       MouseLeave="{Background=Transparent}";
+}
+
+IcoBut {
+       Template = "#Crow.Coding.ui.IcoBut.template";
+       MinimumSize = "10,10";
+       Width = "8";
+       Height = "14";
+       Background = "White";
+}
+
+WinSchema {
+       Template="#Crow.Coding.ui.DockWindows.WinSchemaItem.template";
+       Focusable = "true";
+       MinimumSize="150,50";
+       Width = "Fit";
+       Height = "Fit";
+}
+TabItem {
+       AllowDrag="false";
+       Background="Jet";
+}
+TreeItemBorder {
+       CornerRadius="2";
+       Margin="0";
+       Focusable="true";
+       Height="Fit";
+       Width="Stretched";
+       Foreground="Transparent";
+       MouseEnter="{Foreground=DimGrey}";
+       MouseLeave="{Foreground=Transparent}";
+}
+TreeIcon {
+       Margin="0";
+       Width="14";
+       Height="14";
+}
+NormalizedFloat {
+    Minimum="0.0";
+    Maximum="1.0";
+    SmallIncrement="0.01";
+    LargeIncrement="0.1";
+    Decimals="2";
+    Width="60";
+    Foreground="Black";
+}
diff --git a/samples/RayTests/ui/main.crow b/samples/RayTests/ui/main.crow
new file mode 100644 (file)
index 0000000..14e6082
--- /dev/null
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<Window Caption="Lighting" Icon="#deferred.crow.svg" Left="10" Top="100" Width="40%" Height="40%" CornerRadius="10">
+    <VerticalStack Spacing="1" Margin="10" CacheEnabled="true">     
+        <HorizontalStack Height="Fit" >
+            <Label Text="Exposure:" Width="80"/>
+            <Slider Height="10" Value="{²Exposure}" Maximum="10.0" SmallIncrement="0.1" LargeIncrement="1.0"/>
+            <Label Text="{Exposure}" Width="40" TextAlignment="Right" />
+        </HorizontalStack>
+        <HorizontalStack Height="Fit">
+            <Label Text="Gamma:" Width="80" />
+            <Slider Height="10" Value="{²Gamma}" Maximum="10.0" SmallIncrement="0.1" LargeIncrement="1.0"/>
+            <Label Text="{Gamma}" Width="40" TextAlignment="Right" />
+        </HorizontalStack>
+        <HorizontalStack Height="Fit">
+            <Label Text="Light Strength:" Width="100" />
+            <Slider Height="10" Value="{²LightStrength}" Maximum="50.0" SmallIncrement="0.1" LargeIncrement="5.0"/>
+            <Label Text="{LightStrength}" Width="40" TextAlignment="Right" />
+        </HorizontalStack>
+        <ListBox Name="dv" Data="{Lights}" Width="Stretched" Height="Fit">
+            <ItemTemplate>
+                <Border Height="Fit">
+                    <VerticalStack>
+                        <HorizontalStack>
+                            <Label Text="Position" Width="50"/>
+                            <Label Text="{position}"/>
+                        </HorizontalStack>
+                        <HorizontalStack>
+                            <Label Text="Color" Width="50"/>
+                            <Label Text="{color}"/>
+                        </HorizontalStack>
+                    </VerticalStack>                    
+                </Border>                    
+            </ItemTemplate>            
+        </ListBox>        
+    </VerticalStack>
+</Window>
+
diff --git a/samples/RayTests/ui/materials.crow b/samples/RayTests/ui/materials.crow
new file mode 100644 (file)
index 0000000..b4c5432
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<Window Icon="#deferred.crow.svg" Left="10" Top="100" Width="40%" Height="40%" CornerRadius="10">
+    <VerticalStack>
+    <ListBox Data="{Materials}">
+        <ItemTemplate  DataType="PbrMaterial">
+            <VerticalStack>
+                <ColorPicker Width="260" Height="Fit"/>
+                <HorizontalStack>
+                    <Label Width="Stretched" Text="Metallic Factor"/>
+                    <Spinner Style="NormalizedFloat" Value="{²metallicFactor}"/>
+                </HorizontalStack>
+                <HorizontalStack>
+                    <Label Width="Stretched" Text="Roughness Factor"/>
+                    <Spinner Style="NormalizedFloat" Value="{²roughnessFactor}"/>
+                </HorizontalStack>
+                <HorizontalStack>
+                    <Label Width="Stretched" Text="Alpha Mask"/>
+                    <Spinner Style="NormalizedFloat" Value="{²alphaMask}"/>
+                </HorizontalStack>
+                <HorizontalStack>
+                    <Label Width="Stretched" Text="Alpha Mask Cutoff"/>
+                    <Spinner Style="NormalizedFloat" Value="{²alphaMaskCutoff}"/>            
+                </HorizontalStack>
+            </VerticalStack>
+        </ItemTemplate>        
+    </ListBox>
+    <Button Caption="Apply" MouseClick="onApplyMaterialChanges"/>
+    </VerticalStack>
+</Window>
+
diff --git a/samples/RayTests/ui/menu.crow b/samples/RayTests/ui/menu.crow
new file mode 100644 (file)
index 0000000..1cc36be
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<Menu>
+    <MenuItem Caption="View" Fit="true" PopWidth="150">
+        <MenuItem Command="{CMDViewScenes}"/>
+        <MenuItem Command="{CMDViewDebug}"/>
+        <MenuItem Command="{CMDViewEditor}"/>
+        <MenuItem Command="{CMDViewMaterials}"/>
+    </MenuItem>
+</Menu>
\ No newline at end of file
diff --git a/samples/RayTests/ui/sceneItem.crow b/samples/RayTests/ui/sceneItem.crow
new file mode 100644 (file)
index 0000000..ecb3a53
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<VerticalStack>
+    <Border Style="TreeItemBorder" MouseDoubleClick="./onClickForExpand">
+        <HorizontalStack Spacing="5">
+            <Image Margin="1" Width="10" Height="10" Focusable="true" MouseDown="./onClickForExpand"
+                Path="{./Image}"
+                Visible="{./IsExpandable}"
+                SvgSub="{./IsExpanded}"
+                MouseEnter="{Background=LightGrey}"
+                MouseLeave="{Background=Transparent}"/>
+            <Image Style="TreeIcon"
+                Path="#Crow.Icons.folder.svg" SvgSub="{./IsExpanded}"/>
+            <Label Text="{./Caption}"/>
+        </HorizontalStack>
+    </Border>
+    <Container Name="Content" Visible="false"/>
+</VerticalStack>
+
diff --git a/samples/RayTests/ui/scenes.crow b/samples/RayTests/ui/scenes.crow
new file mode 100644 (file)
index 0000000..b7f1b4f
--- /dev/null
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<Window Caption="Scenes" Icon="#deferred.crow.svg" Left="10" Top="100" Width="40%" Height="80%" CornerRadius="10">    
+        <TreeView Data="{Scenes}" Width="Stretched">
+            <ItemTemplate DataType="Scene" Data="GetNodes">
+                <Expandable Caption="{Name}" Template="#deferred.sceneItem.crow" IsExpanded="{²IsExpanded}">
+                    <HorizontalStack Height="Fit">
+                        <Widget Width="8" Height="10"/>
+                        <VerticalStack Height="Fit" Name="ItemsContainer"/>
+                    </HorizontalStack>
+                </Expandable>                
+            </ItemTemplate>
+            <ItemTemplate DataType="Node" Data="Children">
+                <Expandable Caption="Node" IsExpanded="{²IsExpanded}">
+                    <Template>
+                        <VerticalStack>
+                            <Border Style="TreeItemBorder" MouseDoubleClick="./onClickForExpand">
+                                <HorizontalStack Spacing="5">
+                                    <Image Margin="1" Width="10" Height="10" Focusable="true" MouseDown="./onClickForExpand"
+                                        Path="{./Image}"
+                                        Visible="{./IsExpandable}"
+                                        SvgSub="{./IsExpanded}"
+                                        MouseEnter="{Background=LightGrey}"
+                                        MouseLeave="{Background=Transparent}"/>
+                                    <Image Style="TreeIcon"
+                                        Path="#Crow.Icons.folder.svg" SvgSub="{./IsExpanded}"/>
+                                    <Label Text="{./Caption}"/>
+                                    <Label DataSource="{Mesh}" Text="{Name}"/>
+                                </HorizontalStack>
+                            </Border>
+                            <Container Name="Content" Visible="false"/>
+                        </VerticalStack>                        
+                    </Template>>
+                    <HorizontalStack Height="Fit">
+                        <Widget Width="8" Height="10"/>
+                        <VerticalStack Height="Fit" Name="ItemsContainer"/>                    
+                    </HorizontalStack>
+                </Expandable>                
+            </ItemTemplate>
+        </TreeView>           
+</Window>
+
diff --git a/samples/RayTests/ui/testImage.crow b/samples/RayTests/ui/testImage.crow
new file mode 100644 (file)
index 0000000..c245e14
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<EnumSelector Height="300" EnumValue="{²CurrentDebugView}"/>
+
index d7de312e20f0cdfa2bd011230d06d8c9dbb9eb2a..3206cca9643ce8d3dd00352d29cfa8eb779973d1 100644 (file)
@@ -92,8 +92,8 @@ namespace Textured {
                        cfg.AddVertexBinding (0, 5 * sizeof(float));
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32Sfloat);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.main.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.main.frag.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Vertex, "#shaders.main.vert.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.main.frag.spv");
 
                        pipeline = new GraphicPipeline (cfg);
 
index 15077569192b51c1885a100b06e831c072388a3c..ec32a4cf1a9a23d3202013f632a3933c099cebca 100644 (file)
@@ -25,6 +25,10 @@ namespace TextureCube {
                        }
                }
 
+               public override string[] EnabledInstanceExtensions => new string[] {
+                       Ext.I.VK_EXT_debug_utils,
+               };
+
                float rotSpeed = 0.01f, zoomSpeed = 0.01f;
                float rotX, rotY, rotZ = 0f, zoom = 1f;
 
@@ -137,11 +141,13 @@ namespace TextureCube {
                        cfg.AddVertexBinding (0, 5 * sizeof (float));
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32Sfloat);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.skybox.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.skybox.frag.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Vertex, "#shaders.skybox.vert.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.skybox.frag.spv");
 
                        pipeline = new GraphicPipeline (cfg);
 
+                       cfg.DisposeShaders ();
+
                        uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, matrices);
                        uboMats.Map ();//permanent map
 
@@ -171,7 +177,12 @@ namespace TextureCube {
                                cmds[i].End ();                          
                        }
                } 
-               void recordDraw (PrimaryCommandBuffer cmd, FrameBuffer fb) { 
+               void recordDraw (PrimaryCommandBuffer cmd, FrameBuffer fb) {
+#if WITH_VKVG
+                       vkvgPipeline.Texture.SetLayout (cmd, VkImageAspectFlags.Color,
+                               VkImageLayout.ColorAttachmentOptimal, VkImageLayout.ShaderReadOnlyOptimal,
+                               VkPipelineStageFlags.ColorAttachmentOutput, VkPipelineStageFlags.FragmentShader);
+#endif
                        pipeline.RenderPass.Begin (cmd, fb);
 
                        cmd.SetViewport (fb.Width, fb.Height);
@@ -186,9 +197,13 @@ namespace TextureCube {
 #if WITH_VKVG
                        cmd.BindDescriptorSet (pipeline.Layout, dsVkvg);
                        vkvgPipeline.RecordDraw (cmd);
-#endif
-
                        pipeline.RenderPass.End (cmd);
+                       vkvgPipeline.Texture.SetLayout (cmd, VkImageAspectFlags.Color,
+                               VkImageLayout.ShaderReadOnlyOptimal, VkImageLayout.ColorAttachmentOptimal,
+                               VkPipelineStageFlags.FragmentShader, VkPipelineStageFlags.ColorAttachmentOutput);
+#else
+                       pipeline.RenderPass.End (cmd);
+#endif
                }
 
                //in the thread of the keyboard
@@ -280,6 +295,12 @@ namespace TextureCube {
 
 #if WITH_VKVG
                        vkvgPipeline.Resize ((int)Width, (int)Height, new DescriptorSetWrites (dsVkvg, dsLayout.Bindings[1]));
+                       PrimaryCommandBuffer cmd = cmdPool.AllocateAndStart (VkCommandBufferUsageFlags.OneTimeSubmit);
+                       vkvgPipeline.Texture.SetLayout (cmd, VkImageAspectFlags.Color,
+                               VkImageLayout.Undefined, VkImageLayout.ColorAttachmentOptimal,
+                               VkPipelineStageFlags.AllCommands, VkPipelineStageFlags.ColorAttachmentOutput);
+                       presentQueue.EndSubmitAndWait (cmd, true);
+
 #endif
 
                        updateMatrices ();
index aaab4b5fad8d00480f5b4bc8c14b2237a61558c2..0f1bd345c3efb73083b466d924181e4da3ae90a2 100644 (file)
@@ -79,14 +79,21 @@ namespace Triangle {
                        cfg.AddVertexBinding<Vertex> (0);
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat);//position + color
 
-                       //shader are automatically compiled by SpirVTacks if added to the project. The resulting shaders are automatically embedded in the assembly.
+                       //shader are automatically compiled by SpirVTasks if added to the project. The resulting shaders are automatically embedded in the assembly.
                        //To specifiy that the shader path is a resource name, put the '#' prefix. Else the path will be search on disk.
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.main.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.main.frag.spv");
+                       cfg.AddShaders (
+                               new ShaderInfo (dev, VkShaderStageFlags.Vertex, "#shaders.main.vert.spv"),
+                               new ShaderInfo (dev, VkShaderStageFlags.Fragment, "#shaders.main.frag.spv")
+                       );
 
                        //create and activate the pipeline with the configuration we've just done.
                        pipeline = new GraphicPipeline (cfg);
 
+                       //ShaderInfo used in this configuration with create the VkShaderModule's used
+                       //for creating the pipeline. They have to be disposed to destroy those modules
+                       //used only during pipeline creation.
+                       cfg.DisposeShaders ();
+
                        //because descriptor layout used for a pipeline are only activated on pipeline activation, descriptor set must not be allocated before, except if the layout has been manually activated, 
                        //but in this case, layout will need also to be explicitly disposed.
                        descriptorSet = descriptorPool.Allocate (pipeline.Layout.DescriptorSetLayouts[0]);
index 2c088009798cf206be9098386a5b6a252ea52ec2..228f6ec310dabb1c3575bf56ea99778aa991de27 100644 (file)
@@ -87,8 +87,8 @@ namespace delaunay {
                        cfg.RenderPass.ClearValues[0] = new VkClearValue { color = new VkClearColorValue (0.0f, 0.1f, 0.0f) };
 
                        cfg.ResetShadersAndVerticesInfos ();
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.simpletexture.frag.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
+                       cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.simpletexture.frag.spv");
 
                        cfg.blendAttachments[0] = new VkPipelineColorBlendAttachmentState (true);
 
index f63cabe1cf4778f5d0b5d483ce0087c5dcdabe48..9482386fb19d335aec781550b52648bdcba55277 100644 (file)
@@ -265,11 +265,11 @@ namespace deferred {
                                                new SpecializationConstant<float> (1, farPlane),
                                                new SpecializationConstant<float> (2, MAX_MATERIAL_COUNT))) {
 
-                               cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.GBuffPbr.vert.spv");
+                               cfg.AddShader (dev, VkShaderStageFlags.Vertex, "#shaders.GBuffPbr.vert.spv");
                                if (TEXTURE_ARRAY) 
-                                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.GBuffPbrTexArray.frag.spv", constants);
+                                       cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.GBuffPbrTexArray.frag.spv", constants);
                                else
-                                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.GBuffPbr.frag.spv", constants);
+                                       cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.GBuffPbr.frag.spv", constants);
 
                                gBuffPipeline = new GraphicPipeline (cfg);
                        }
@@ -284,16 +284,17 @@ namespace deferred {
                        cfg.depthStencilState.depthWriteEnable = false;
                        using (SpecializationInfo constants = new SpecializationInfo (
                                new SpecializationConstant<uint> (0, (uint)lights.Length))) {
-                               cfg.AddShader (VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
+                               cfg.AddShader (dev, VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
 #if WITH_SHADOWS
-                               cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.compose_with_shadows.frag.spv", constants);
+                               cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.compose_with_shadows.frag.spv", constants);
 #else
                                cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.compose.frag.spv", constants);
 #endif
                                composePipeline = new GraphicPipeline (cfg);
                        }
                        //DEBUG DRAW use subpass of compose
-                       cfg.shaders[1] = new ShaderInfo (VkShaderStageFlags.Fragment, "#shaders.show_gbuff.frag.spv");
+                       cfg.Shaders[1].Dispose ();
+                       cfg.Shaders[1] = new ShaderInfo (dev, VkShaderStageFlags.Fragment, "#shaders.show_gbuff.frag.spv");
                        cfg.SubpassIndex = SP_COMPOSE;
                        debugPipeline = new GraphicPipeline (cfg);
                        ////TONE MAPPING
@@ -301,6 +302,8 @@ namespace deferred {
                        //cfg.SubpassIndex = SP_TONE_MAPPING;
                        //toneMappingPipeline = new GraphicPipeline (cfg);
 
+                       cfg.DisposeShaders ();
+
                        dsMain = descriptorPool.Allocate (descLayoutMain);
                        dsGBuff = descriptorPool.Allocate (descLayoutGBuff);
 
index dcea5c0931b3503a8b533fbbaae1e44514b93ead..0c08882c5f4a4be4140bbe0d5864e93dc197bbe3 100644 (file)
@@ -65,6 +65,7 @@ namespace deferred {
                };
                string[] modelPathes = {
                                "/mnt/devel/vkPinball/data/models/pinball.gltf",
+                               "/mnt/devel/pinball.net/data/test.glb",
                                Utils.DataDirectory + "models/DamagedHelmet/glTF/DamagedHelmet.gltf",
                                //Utils.DataDirectory + "models/shadow.glb",
                                Utils.DataDirectory + "models/Hubble.glb",
@@ -128,13 +129,15 @@ namespace deferred {
 
                        cfg.RenderPass = new RenderPass (dev, swapChain.ColorFormat, DeferredPbrRenderer.NUM_SAMPLES);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.tone_mapping.frag.spv");
+                       using (ShaderInfo vs = new ShaderInfo (dev, VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv"))
+                       using (ShaderInfo fs = new ShaderInfo (dev, VkShaderStageFlags.Fragment, "#shaders.tone_mapping.frag.spv"))
+                       {
+                               cfg.AddShaders (vs, fs);
 
-                       plToneMap = new GraphicPipeline (cfg);
+                               plToneMap = new GraphicPipeline (cfg);
+                       }
 
                        descriptorSet = descriptorPool.Allocate (cfg.Layout.DescriptorSetLayouts[0]);
-
                }
 
                void buildCommandBuffers () {
@@ -366,9 +369,9 @@ namespace deferred {
                        if (disposing) {
                                if (!isDisposed) {
                                        frameBuffers?.Dispose();
-                                       renderer.Dispose ();
-                                       plToneMap.Dispose ();
-                                       descriptorPool.Dispose ();
+                                       renderer?.Dispose ();
+                                       plToneMap?.Dispose ();
+                                       descriptorPool?.Dispose ();
                                        dbgmsg?.Dispose ();
                                }
                        }
index 9fd322c623ae0ee9b52a24e86664160790424d17..a0ab742a4419d95f93e9bd72655a0811e4cda46e 100644 (file)
@@ -21,6 +21,10 @@ layout (set = 0, binding = 1) uniform UBOLights {
 
 //layout (location = 0) in int inInstanceIndex[];
 
+in gl_PerVertex
+{
+  vec4 gl_Position;
+} gl_in[];
 
 void main() 
 {
index b0bd6c0b4a93965499570db952af2ca9fff1cca9..32e93caf5341145657559337cfbbeeea5a9a41e8 100644 (file)
@@ -6,6 +6,11 @@ layout(push_constant) uniform PushConsts {
     mat4 model;
 } pc;
 
+out gl_PerVertex
+{
+  vec4 gl_Position;
+};
+
 void main()
 {
        gl_Position = pc.model * vec4(inPos,1);
index dab4dd88b20dc6e5032c9512f4ff34779a47604a..5e059c44acf585913d007177a094a681fc66eabb 100644 (file)
@@ -81,16 +81,18 @@ namespace deferred {
 
                        cfg.Layout = new PipelineLayout (dev, descLayoutShadow);
                        cfg.Layout.AddPushConstants (
-                               new VkPushConstantRange (VkShaderStageFlags.Vertex|VkShaderStageFlags.Geometry, (uint)Marshal.SizeOf<Matrix4x4> ())
+                               new VkPushConstantRange (VkShaderStageFlags.Vertex, (uint)Marshal.SizeOf<Matrix4x4> ())
                        );
 
                        cfg.AddVertexBinding<PbrModelTexArray.Vertex> (0);
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.shadow.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Geometry, "#shaders.shadow.geom.spv");
+                       using (ShaderInfo vs = new ShaderInfo (dev, VkShaderStageFlags.Vertex, "#shaders.shadow.vert.spv"))
+                       using (ShaderInfo fs = new ShaderInfo (dev, VkShaderStageFlags.Geometry, "#shaders.shadow.geom.spv")) {
+                               cfg.AddShaders (vs, fs);
 
-                       shadowPipeline = new GraphicPipeline (cfg);
+                               shadowPipeline = new GraphicPipeline (cfg);
+                       }
 
                        //shadow map image
                        shadowMap = new Image (dev, SHADOWMAP_FORMAT, VkImageUsageFlags.DepthStencilAttachment | VkImageUsageFlags.Sampled, VkMemoryPropertyFlags.DeviceLocal, SHADOWMAP_SIZE, SHADOWMAP_SIZE,
index 18eef2860f6b18964806549fd592c4a62abed8a0..28e3760aa86caf94a268a62068d582e99ecab656 100644 (file)
@@ -84,8 +84,8 @@ namespace vke {
                        cfg.AddVertexBinding<PbrModel2.Vertex> (0);
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat, VkFormat.R32g32Sfloat, VkFormat.R32g32Sfloat);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.pbr.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.pbr_khr.frag.spv");
+                       cfg.AddShader (Dev, VkShaderStageFlags.Vertex, "#shaders.pbr.vert.spv");
+                       cfg.AddShader (Dev, VkShaderStageFlags.Fragment, "#shaders.pbr_khr.frag.spv");
 
                        layout = cfg.Layout;
 
diff --git a/samples/vkeEditor/FSQPipeline.cs b/samples/vkeEditor/FSQPipeline.cs
new file mode 100644 (file)
index 0000000..90da1ac
--- /dev/null
@@ -0,0 +1,41 @@
+// Copyright (c) 2019  Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
+using System.Numerics;
+using vke;
+using Vulkan;
+
+namespace vkeEditor {
+
+       public class FSQPipeline : GraphicPipeline {
+               public FSQPipeline (GraphicPipeline pipeline, int attachment = 0, PipelineCache pipelineCache = null)
+               : base (pipeline.RenderPass, pipelineCache, "FSQ pipeline") {
+
+                       GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, this.RenderPass.Samples, false);
+                       cfg.RenderPass = RenderPass;
+                       cfg.Layout = pipeline.Layout;
+                       cfg.AddShader (Dev, VkShaderStageFlags.Vertex, "#vke.FullScreenQuad.vert.spv");
+                       cfg.AddShader (Dev, VkShaderStageFlags.Fragment, "#vke.simpletexture.frag.spv");
+                       cfg.multisampleState.rasterizationSamples = Samples;
+
+                       cfg.blendAttachments[attachment] = new VkPipelineColorBlendAttachmentState (true);
+
+                       layout = cfg.Layout;
+
+                       init (cfg);
+
+                       cfg.DisposeShaders ();
+               }
+
+               public void RecordDraw (CommandBuffer cmd) {
+                       Bind (cmd);
+                       cmd.Draw (3, 1, 0, 0);
+               }
+
+               protected override void Dispose (bool disposing) {
+                       base.Dispose (disposing);
+               }
+       }
+
+}
diff --git a/samples/vkeEditor/ObservablePipelineConfig.cs b/samples/vkeEditor/ObservablePipelineConfig.cs
new file mode 100644 (file)
index 0000000..0a2c557
--- /dev/null
@@ -0,0 +1,105 @@
+// Copyright (c) 2019  Bruyère Jean-Philippe jp_bruyere@hotmail.com
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
+using Crow;
+using vke;
+using Vulkan;
+
+namespace vkeEditor {
+       public class ObservablePipelineConfig : GraphicPipelineConfig, IValueChange {
+               #region IValueChange implementation
+               public event EventHandler<ValueChangeEventArgs> ValueChanged;
+               public virtual void NotifyValueChanged (string MemberName, object _value)
+               {
+                       ValueChanged?.Invoke (this, new Crow.ValueChangeEventArgs (MemberName, _value));
+               }
+               #endregion
+
+
+               public ObservablePipelineConfig ()
+               {
+                       Viewports = new ObservableList<VkViewport> ();
+                       Scissors = new ObservableList<VkRect2D> ();
+                       blendAttachments = new ObservableList<VkPipelineColorBlendAttachmentState> ();
+                       dynamicStates = new ObservableList<VkDynamicState> ();
+                       vertexBindings = new ObservableList<VkVertexInputBindingDescription> ();
+                       vertexAttributes = new ObservableList<VkVertexInputAttributeDescription> ();
+                       Shaders = new ObservableList<ShaderInfo> ();
+               }
+
+               bool isExpanded;
+               public bool IsExpanded {
+                       get => isExpanded;
+                       set {
+                               if (isExpanded == value)
+                                       return;
+                               isExpanded = value;
+                               NotifyValueChanged ("IsExpanded", isExpanded);
+                       }
+               }
+
+               public string FrontGroupBoxCaption =>
+                       FrontAndBackDifferent ? "Front Stencil State" : "Font and Back Stencil States";
+
+               bool frontAndBackDifferent;
+               //front and back stencil state idem
+               public bool FrontAndBackDifferent {
+                       get => frontAndBackDifferent;
+                       set {
+                               if (frontAndBackDifferent == value)
+                                       return;
+                               frontAndBackDifferent = value;
+                               NotifyValueChanged ("FrontAndBackDifferent", frontAndBackDifferent);
+                               NotifyValueChanged ("FrontGroupBoxCaption", FrontGroupBoxCaption);
+                       }
+               }
+               public VkStencilOpState FrontStencil {
+                       get => depthStencilState.front;
+                       set {
+                               depthStencilState.front = value;
+                               if (!frontAndBackDifferent)
+                                       BackStencil = value;
+                               NotifyValueChanged ("FrontStencil", depthStencilState.front);
+                       }
+               }
+               public VkStencilOpState BackStencil {
+                       get => depthStencilState.back;
+                       set {
+                               depthStencilState.back = value;
+                               NotifyValueChanged ("BackStencil", depthStencilState.back);
+                       }
+               }
+
+               #region BlendAttachments
+               public ObservableList<VkViewport> ObsViewports
+                       =>Viewports as ObservableList<VkViewport>;
+               public ObservableList<VkRect2D> ObsScissors
+                       => Scissors as ObservableList<VkRect2D>;
+               public ObservableList<VkPipelineColorBlendAttachmentState> ObsBlendAttachments
+                       => blendAttachments as ObservableList<VkPipelineColorBlendAttachmentState>;
+               public ObservableList<VkDynamicState> ObsDynamicStates
+                       => dynamicStates as ObservableList<VkDynamicState>;
+               public ObservableList<VkVertexInputBindingDescription> ObsVertexBindings
+                       => vertexBindings as ObservableList<VkVertexInputBindingDescription>;
+               public ObservableList<VkVertexInputAttributeDescription> ObsVertexAttributes
+                       => vertexAttributes as ObservableList<VkVertexInputAttributeDescription>;
+               public ObservableList<ShaderInfo> ObsShaders
+                       => Shaders as ObservableList<ShaderInfo>;
+
+               public void onEditBlendAttachmentClick (object sender, MouseEventArgs e)
+               {
+                       /*Widget w = VkWindow.CurWin.loadWindow ("ui/editBlendAttachment.crow", this);
+                       w.FindByName ("OkButton").MouseClick += (s, ev) => ObsBlendAttachments.RaiseEdit (); */
+               }
+               public void onEditVertexAttributesClick (object sender, MouseEventArgs e)
+               {
+                       /*Widget w = VkCrowWindow.CurWin.loadWindow ("ui/editVertexAttributes.crow", this);
+                       w.FindByName ("OkButton").MouseClick += (s, ev) => ObsVertexAttributes.RaiseEdit ();*/
+               }
+
+               #endregion
+
+
+       }
+}
diff --git a/samples/vkeEditor/Program.cs b/samples/vkeEditor/Program.cs
new file mode 100644 (file)
index 0000000..1eb1101
--- /dev/null
@@ -0,0 +1,367 @@
+// Copyright (c) 2019  Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Glfw;
+using vke;
+using Vulkan;
+
+namespace vkeEditor {
+       public class Program : VkWindow, Crow.IValueChange {
+               #region IValueChange implementation
+               public event EventHandler<Crow.ValueChangeEventArgs> ValueChanged;
+               public virtual void NotifyValueChanged (string MemberName, object _value)
+               {
+                       ValueChanged?.Invoke (this, new Crow.ValueChangeEventArgs (MemberName, _value));
+               }
+               #endregion
+
+               static void Main (string [] args)
+               {
+#if DEBUG
+                       Instance.VALIDATION = false;
+                       //Instance.RENDER_DOC_CAPTURE = true;
+#endif
+
+                       using (Program vke = new Program ()) {
+                               vke.Run ();
+                       }
+               }
+
+               float rotSpeed = 0.01f, zoomSpeed = 0.01f;
+               float rotX, rotY, rotZ = 0f, zoom = 1f;
+
+               struct Matrices {
+                       public Matrix4x4 projection;
+                       public Matrix4x4 view;
+                       public Matrix4x4 model;
+               }
+               struct Vertex {
+                       Vector3 position;
+                       Vector3 color;
+
+                       public Vertex (float x, float y, float z, float r, float g, float b)
+                       {
+                               position = new Vector3 (x, y, z);
+                               color = new Vector3 (r, g, b);
+                       }
+               }
+
+               public RenderPass RenderPass => pipeline.RenderPass;
+
+               Matrices matrices;
+
+               HostBuffer ibo;
+               HostBuffer vbo;
+               HostBuffer uboMats;
+
+               public DescriptorPool descriptorPool;
+               DescriptorSetLayout dsLayout;
+               DescriptorSet descriptorSet;
+
+               FrameBuffers frameBuffers;
+               GraphicPipeline pipeline;
+
+               Vertex [] vertices = {
+                       new Vertex (-1.0f, -1.0f, 0.0f ,  1.0f, 0.0f, 0.0f),
+                       new Vertex ( 1.0f, -1.0f, 0.0f ,  0.0f, 1.0f, 0.0f),
+                       new Vertex ( 0.0f,  1.0f, 0.0f ,  0.0f, 0.0f, 1.0f),
+               };
+               ushort [] indices = new ushort [] { 0, 1, 2 };
+
+               FSQPipeline fsqPl;
+
+               string source;
+
+               public string Source {
+                       get => Source;
+                       set {
+                               if (source == value)
+                                       return;
+                               source = value;
+                               NotifyValueChanged ("Source", source);
+                       }
+               }
+
+               GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, VkSampleCountFlags.SampleCount1, true);
+
+               Program () : base ()
+               {
+
+               }
+
+               protected override void initVulkan () {
+                       base.initVulkan ();
+                       cmds = cmdPool.AllocateCommandBuffer (swapChain.ImageCount);
+                       updateUI = cmdPool.AllocateCommandBuffer ();
+
+                       vbo = new HostBuffer<Vertex> (dev, VkBufferUsageFlags.VertexBuffer, vertices);
+                       ibo = new HostBuffer<ushort> (dev, VkBufferUsageFlags.IndexBuffer, indices);
+                       uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, matrices);
+
+                       descriptorPool = new DescriptorPool (dev, 1,
+                               new VkDescriptorPoolSize (VkDescriptorType.UniformBuffer),
+                               new VkDescriptorPoolSize (VkDescriptorType.CombinedImageSampler));
+
+                       dsLayout = new DescriptorSetLayout (dev,
+                               new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Vertex, VkDescriptorType.UniformBuffer),
+                               new VkDescriptorSetLayoutBinding (1, VkShaderStageFlags.Fragment, VkDescriptorType.CombinedImageSampler)
+                       );
+
+                       cfg.Layout = new PipelineLayout (dev, dsLayout);
+                       cfg.RenderPass = new RenderPass (dev, swapChain.ColorFormat, dev.GetSuitableDepthFormat (), cfg.Samples);
+                       cfg.AddVertexBinding<Vertex> (0);
+                       cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat);
+
+                       using (shaderc.Compiler comp = new shaderc.Compiler ()) {
+                               cfg.AddShaders (comp.CreateShaderInfo (dev, "shaders/main.vert", shaderc.ShaderKind.VertexShader));
+                               cfg.AddShaders (comp.CreateShaderInfo (dev, "shaders/main.frag", shaderc.ShaderKind.FragmentShader));
+                       }
+
+                       pipeline = new GraphicPipeline (cfg);
+
+                       cfg.DisposeShaders ();
+
+                       fsqPl = new FSQPipeline (pipeline, 0);
+
+                       //note that descriptor set is allocated after the pipeline creation that use this layout, layout is activated
+                       //automaticaly on pipeline creation, and will be disposed automatically when no longuer in use.
+                       descriptorSet = descriptorPool.Allocate (dsLayout);
+
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (descriptorSet, dsLayout.Bindings[0]);
+                       uboUpdate.Write (dev, uboMats.Descriptor);
+
+                       uboMats.Map ();
+
+                       iFace = new Crow.Interface ((int)Width, (int)Height, this.WindowHandle);
+                       iFace.Init ();
+                       iFace.Load ("#ui.testImage.crow").DataSource = this;
+                       UpdateFrequency = 30;
+
+                       updateUIFence = new Fence (dev, true);
+
+                       Thread ui = new Thread (uiThread);
+                       ui.IsBackground = true;
+                       ui.Start ();
+               }
+               volatile bool running;
+
+               void uiThread () {
+                       running = true;
+                       while (running) {
+                               iFace.Update ();
+                               Thread.Sleep (10);
+                       }
+               }
+
+               protected override void render () {
+               
+                       int idx = swapChain.GetNextImage ();
+                       if (idx < 0) {
+                               OnResize ();
+                               return;
+                       }
+
+                       if (cmds[idx] == null)
+                               return;
+
+                       //updateUIFence.Wait ();
+                       drawFence.Wait ();
+                       drawFence.Reset ();
+
+                       if (Monitor.IsEntered (iFace.UpdateMutex))
+                               Monitor.Exit (iFace.UpdateMutex);
+
+                       presentQueue.Submit (cmds[idx], swapChain.presentComplete, drawComplete[idx], drawFence);
+                       presentQueue.Present (swapChain, drawComplete[idx]);
+
+                       //presentQueue.WaitIdle ();
+               
+               }
+
+               PrimaryCommandBuffer updateUI;
+               Fence updateUIFence;
+
+               public override void Update ()
+               {
+                       //presentQueue.WaitIdle ();
+                       //updateUIFence.Wait ();
+                       //updateUIFence.Reset ();
+                       if (iFace.IsDirty) {
+                               drawFence.Wait ();
+                               drawFence.Reset ();
+                               Monitor.Enter (iFace.UpdateMutex);
+                               presentQueue.Submit (updateUI, default, default, drawFence);
+                               iFace.IsDirty = false;
+                       }
+                       NotifyValueChanged ("fps", fps);
+               }
+               public override void UpdateView ()
+               {
+                       matrices.projection = Matrix4x4.CreatePerspectiveFieldOfView (Utils.DegreesToRadians (45f),
+                               (float)swapChain.Width / (float)swapChain.Height, 0.1f, 256.0f) * Camera.VKProjectionCorrection;
+                       matrices.view =
+                               Matrix4x4.CreateFromAxisAngle (Vector3.UnitZ, rotZ) *
+                               Matrix4x4.CreateFromAxisAngle (Vector3.UnitY, rotY) *
+                               Matrix4x4.CreateFromAxisAngle (Vector3.UnitX, rotX) *
+                               Matrix4x4.CreateTranslation (0, 0, -3f * zoom);
+                       matrices.model = Matrix4x4.Identity;
+                       uboMats.Update (matrices, (uint)Marshal.SizeOf<Matrices> ());
+                       updateViewRequested = false;
+               }
+
+               protected override void onMouseMove (double xPos, double yPos)
+               {
+
+                       iFace.OnMouseMove ((int)xPos, (int)yPos);
+
+                       if (iFace.HoverWidget != null)
+                               return;
+
+                       double diffX = lastMouseX - xPos;
+                       double diffY = lastMouseY - yPos;
+                       if (MouseButton [0]) {
+                               rotY -= rotSpeed * (float)diffX;
+                               rotX += rotSpeed * (float)diffY;
+                       } else if (MouseButton [1]) {
+                               zoom += zoomSpeed * (float)diffY;
+                       } else
+                               return;
+                       updateViewRequested = true;
+               }
+               protected override void onMouseButtonDown (MouseButton button)
+               {
+                       iFace.OnMouseButtonDown (button);
+               }
+               protected override void onMouseButtonUp (MouseButton button)
+               {
+                       iFace.OnMouseButtonUp (button);
+               }
+               protected override void onKeyUp (Key key, int scanCode, Modifier modifiers) {
+                       if (!iFace.OnKeyUp (key))
+                               base.onKeyUp (key, scanCode, modifiers);
+               }
+               protected override void onKeyDown (Key key, int scanCode, Modifier modifiers) {
+                       if (!iFace.OnKeyDown (key))
+                               base.onKeyDown (key, scanCode, modifiers);
+               }
+               protected override void onChar (CodePoint cp) {
+                       if (!iFace.OnKeyPress(cp.ToChar()))
+                               base.onChar (cp);
+               }
+               void buildCommandBuffers ()
+               {
+                       cmdPool.Reset ();
+                       for (int i = 0; i < swapChain.ImageCount; ++i) {
+                               FrameBuffer fb = frameBuffers [i];
+                               cmds [i].Start ();
+
+                                       
+                               pipeline.RenderPass.Begin (cmds [i], fb);
+
+                               cmds [i].SetViewport (swapChain.Width, swapChain.Height);
+                               cmds [i].SetScissor (swapChain.Width, swapChain.Height);
+
+                               cmds [i].BindDescriptorSet (pipeline.Layout, descriptorSet);
+
+                               cmds [i].BindPipeline (pipeline);
+
+                               cmds [i].BindVertexBuffer (vbo);
+                               cmds [i].BindIndexBuffer (ibo, VkIndexType.Uint16);
+                               cmds [i].DrawIndexed ((uint)indices.Length);
+
+                               fsqPl.Bind (cmds [i]);
+                               fsqPl.RecordDraw (cmds [i]);
+
+                               pipeline.RenderPass.End (cmds [i]);
+
+
+                               cmds[i].End ();
+                       }
+
+                       updateUI.Start ();
+                       uiImage.SetLayout (updateUI, VkImageAspectFlags.Color,
+                               VkImageLayout.ShaderReadOnlyOptimal, VkImageLayout.TransferDstOptimal,
+                               VkPipelineStageFlags.FragmentShader, VkPipelineStageFlags.Transfer);
+
+                       uiBuffer.CopyTo (updateUI, uiImage, VkImageLayout.ShaderReadOnlyOptimal);
+
+                       uiImage.SetLayout (updateUI, VkImageAspectFlags.Color,
+                               VkImageLayout.TransferDstOptimal, VkImageLayout.ShaderReadOnlyOptimal,
+                               VkPipelineStageFlags.Transfer, VkPipelineStageFlags.FragmentShader);
+                       updateUI.End ();
+               }
+
+               protected override void OnResize ()
+               {
+                       base.OnResize ();
+
+                       dev.WaitIdle ();
+
+                       lock (iFace.UpdateMutex)
+                               initUISurface ();
+                       iFace.ProcessResize (new Crow.Rectangle (0,0,(int)Width, (int)Height));
+
+                       frameBuffers?.Dispose ();
+                       frameBuffers = pipeline.RenderPass.CreateFrameBuffers (swapChain);
+
+                       buildCommandBuffers ();
+               }
+
+               protected override void Dispose (bool disposing)
+               {
+                       dev.WaitIdle ();
+                       running = false;
+                       if (disposing) {
+                               if (!isDisposed) {
+                                       pipeline.Dispose ();
+                                       fsqPl.Dispose ();
+
+                                       frameBuffers?.Dispose ();
+                                       descriptorPool.Dispose ();
+                                       vbo.Dispose ();
+                                       ibo.Dispose ();
+                                       uboMats.Dispose ();
+                                       uiImage?.Dispose ();
+                                       uiBuffer?.Dispose ();
+                                       updateUIFence.Dispose ();
+                               }
+                       }
+                       iFace.Dispose ();
+                       base.Dispose (disposing);
+               }
+
+               public Image uiImage;
+               public HostBuffer uiBuffer;
+
+               Crow.Interface iFace;
+
+               void initUISurface ()
+               {
+                       iFace.surf?.Dispose ();
+                       uiImage?.Dispose ();
+                       uiBuffer?.Dispose ();
+
+                       uiBuffer = new HostBuffer (dev, VkBufferUsageFlags.TransferSrc | VkBufferUsageFlags.TransferDst, Width * Height * 4,  true);
+
+                       uiImage = new Image (dev, VkFormat.B8g8r8a8Unorm, VkImageUsageFlags.Sampled,
+                               VkMemoryPropertyFlags.DeviceLocal, Width, Height, VkImageType.Image2D, VkSampleCountFlags.SampleCount1, VkImageTiling.Linear);
+                       uiImage.CreateView (VkImageViewType.ImageView2D, VkImageAspectFlags.Color);
+                       uiImage.CreateSampler (VkFilter.Nearest, VkFilter.Nearest, VkSamplerMipmapMode.Nearest, VkSamplerAddressMode.ClampToBorder);
+                       uiImage.Descriptor.imageLayout = VkImageLayout.ShaderReadOnlyOptimal;
+                       //uiImage.Map ();
+
+                       NotifyValueChanged ("uiImage", uiImage);
+
+                       DescriptorSetWrites uboUpdate = new DescriptorSetWrites (descriptorSet, dsLayout.Bindings [1]);
+                       uboUpdate.Write (dev, uiImage.Descriptor);
+
+                       iFace.surf = new Crow.Cairo.ImageSurface (uiBuffer.MappedData, Crow.Cairo.Format.ARGB32,
+                               (int)Width, (int)Height, (int)Width * 4);                               
+
+               }
+       }
+}
diff --git a/samples/vkeEditor/VkFormatWidget.cs b/samples/vkeEditor/VkFormatWidget.cs
new file mode 100644 (file)
index 0000000..2351155
--- /dev/null
@@ -0,0 +1,34 @@
+// Copyright (c) 2020  Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
+using Crow;
+using Crow.Cairo;
+using Vulkan;
+
+namespace vkeEditor {
+       public class VkFormatWidget : Widget {
+               public VkFormatWidget () {
+               }
+
+               VkFormat format;
+               public VkFormat Format {
+                       get => format;
+                       set {
+                               if (format == value)
+                                       return;
+                               format = value;
+                               NotifyValueChanged ("Format", format);
+                               RegisterForGraphicUpdate ();
+                       }
+               }
+
+               protected override void onDraw (Context gr) {
+                       base.onDraw (gr);
+
+                       Rectangle r = ClientRectangle;
+
+
+               }
+       }
+}
diff --git a/samples/vkeEditor/shaders/main.frag b/samples/vkeEditor/shaders/main.frag
new file mode 100644 (file)
index 0000000..4e79d2e
--- /dev/null
@@ -0,0 +1,9 @@
+#version 450
+
+layout (location = 0) in vec3 inColor;
+layout (location = 0) out vec4 outFragColor;
+
+void main() 
+{
+    outFragColor = vec4(inColor, 1.0);
+}
\ No newline at end of file
diff --git a/samples/vkeEditor/shaders/main.vert b/samples/vkeEditor/shaders/main.vert
new file mode 100644 (file)
index 0000000..fd9e54e
--- /dev/null
@@ -0,0 +1,31 @@
+#version 450
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (location = 0) in vec3 inPos;
+layout (location = 1) in vec3 inColor;
+
+layout (binding = 0) uniform UBO 
+{
+       mat4 projectionMatrix;
+    mat4 viewMatrix;
+       mat4 modelMatrix;
+} ubo;
+
+layout (location = 0) out vec3 outColor;
+
+out gl_PerVertex 
+{
+    vec4 gl_Position;   
+};
+
+
+void main()
+{
+       outColor = inColor;
+       gl_Position = ubo.projectionMatrix * ubo.viewMatrix * ubo.modelMatrix * vec4(inPos.xyz, 1.0);
+       //gl_Position.y = -gl_Position.y;
+       //gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0;
+
+}
\ No newline at end of file
diff --git a/samples/vkeEditor/ui/main.crow b/samples/vkeEditor/ui/main.crow
new file mode 100755 (executable)
index 0000000..00b39d6
--- /dev/null
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!--<Widget Width="Stretched" Height="Stretched" Background="Blue"/>-->
+<Border CornerRadius="10" Left="10" Top="10" Width="80%" Height="80%" Background="0.3,0.3,0.3,0.5">
+       <VerticalStack Spacing="2" Margin="20">
+               <HorizontalStack Height="Fit">
+                       <Label Margin="2" Text="Fps:" Width="80" Background="SteelBlue" />
+                       <Label Margin="2" Text="{fps}" Width="80" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}" />
+               </HorizontalStack>
+               <Spinner Caption="test" Width="60" />
+               <Slider Height="10" Width="Stretched" Background="Jet" Foreground="White" />
+               <GroupBox Caption="Descriptor Pool" Height="Fit" DataSource="{descriptorPool}" Margin="10">
+                       <VerticalStack>
+                               <HorizontalStack Height="Fit">
+                                       <Label Width="Stretched" Text="Max Sets" />
+                                       <Label Width="50" Text="{MaxSets}" TextAlignment="Right" />
+                               </HorizontalStack>
+                               <ListBox Data="{PoolSizes}">
+                                       <ItemTemplate>
+                                               <HorizontalStack Height="Fit">
+                                                       <Label Background="DimGrey" Width="Stretched" Text="{type}" />
+                                                       <Label Background="DimGrey" Width="50" Text="{descriptorCount}" TextAlignment="Right" />
+                                               </HorizontalStack>
+                                       </ItemTemplate>
+                               </ListBox>
+                       </VerticalStack>
+               </GroupBox>
+               <GroupBox Caption="Image" Height="Fit" DataSource="{uiImage}" Margin="10">
+                       <VerticalStack DataSource="{CreateInfo}">
+                               <HorizontalStack Height="Fit">
+                                       <Label Width="50%" Text="Format" />
+                                       <Label Text="{format}" />
+                               </HorizontalStack>
+                               <HorizontalStack Height="Fit">
+                                       <Label Width="50%" Text="Type" />
+                                       <Label Text="{imageType}" />
+                               </HorizontalStack>
+                               <HorizontalStack Height="Fit" DataSource="{extent}">
+                                       <Label Width="50%" Text="Size" />
+                                       <Label Text="{width}" />
+                                       <Label Text=" x " />
+                                       <Label Text="{height}" />
+                                       <Label Text=" x " />
+                                       <Label Text="{depth}" />
+                               </HorizontalStack>
+                               <HorizontalStack Height="Fit">
+                                       <Label Width="50%" Text="usage" />
+                                       <Label Text="{usage}" />
+                               </HorizontalStack>
+                       </VerticalStack>
+               </GroupBox>
+               <VerticalStack DataSource="{RenderPass}" Height="Fit" Background="Grey">
+                       <ListBox Data="{Attachments}" Height="Fit">
+                               <Template>
+                                       <HorizontalStack Background="SteelBlue">
+                                               <Label Margin="10" Text="RP" />
+                                               <HorizontalStack Background="DimGrey" Name="ItemsContainer" Margin="10" />
+                                       </HorizontalStack>
+                               </Template>
+                               <ItemTemplate>
+                                       <VerticalStack Fit="true" Background="DarkBlue" CornerRadius="5">
+                                               <Label Fit="true" Text="{format}" />
+                                               <Label Fit="true" Text="{samples}" />
+                                               <HorizontalStack Width="Stretched">
+                                                       <Label Width="100" Text="{loadOp}" TextAlignment="Center" />
+                                                       <Label Width="100" Text="{storeOp}" TextAlignment="Center" />
+                                               </HorizontalStack>
+                                               <HorizontalStack>
+                                                       <Label Width="100" Text="{initialLayout}" TextAlignment="Center" />
+                                                       <Label Width="100" Text="{finalLayout}" TextAlignment="Center" />
+                                               </HorizontalStack>
+                                       </VerticalStack>
+                               </ItemTemplate>
+                       </ListBox>
+                       <!--                    <ListBox Data="{SubPasses}" Height="Fit">
+                               <Template>
+                                       <VerticalStack Height="Fit" Name="ItemsContainer" Background="DimGrey"/>
+                               </Template>
+                               <ItemTemplate>                                  
+                                       <Label Background="Red" Width="Stretched" Text="{format}" />                                                                                    
+                               </ItemTemplate>
+                       </ListBox>-->
+               </VerticalStack>
+       </VerticalStack>
+</Border>
\ No newline at end of file
diff --git a/samples/vkeEditor/ui/testImage.crow b/samples/vkeEditor/ui/testImage.crow
new file mode 100644 (file)
index 0000000..e23b4e4
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<Window Width="50%" Height="50%">
+       <VerticalStack>
+               <Slider Height="10"/>
+               <!--<HorizontalStack Fit="true" Margin="5">
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+                       <Label Text="{fps}" Fit="true" Background="SeaGreen" Margin="5" CornerRadius="3"/>
+               </HorizontalStack>-->
+               <TextBox Text="{Source}" Height="Stretched" Multiline="True" TextAlignment="TopLeft"/>
+       </VerticalStack>
+</Window>
+
diff --git a/samples/vkeEditor/vkeEditor.csproj b/samples/vkeEditor/vkeEditor.csproj
new file mode 100644 (file)
index 0000000..e00c02c
--- /dev/null
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+       <PropertyGroup>
+               <IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
+       </PropertyGroup>
+       <ItemGroup>
+               <PackageReference Include="Crow" Version="0.8.11-beta" />
+       </ItemGroup>
+       <ItemGroup>
+               <GLSLShader Remove="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom" />
+               <None Include="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom">
+                       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+               </None>
+       </ItemGroup>    
+</Project>
\ No newline at end of file
index 475e6288389a65d55a4a8465a45ae9d12ebad69d..d8f213911bf2663b5b7b9790f8ec285d6d32abcb 100644 (file)
@@ -47,6 +47,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "deferred", "samples\deferre
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pbr", "samples\pbr\pbr.csproj", "{7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pinball", "samples\pinball\pinball.csproj", "{615FD107-F5F0-4C0D-8D3F-C6F53D50273C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vkeEditor", "samples\vkeEditor\vkeEditor.csproj", "{901AC007-7646-4171-A302-23E45C428F15}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -171,6 +175,26 @@ Global
                {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU
                {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
                {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.Release|Any CPU.Build.0 = Release|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.DebugCrow|Any CPU.ActiveCfg = DebugCrow|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.DebugCrow|Any CPU.Build.0 = DebugCrow|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.ReleaseSpirVTasks|Any CPU.Build.0 = Debug|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.Release|Any CPU.Build.0 = Release|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.ReleaseSpirVTasks|Any CPU.Build.0 = Debug|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
+               {901AC007-7646-4171-A302-23E45C428F15}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(NestedProjects) = preSolution
                {FEF3AF30-5B88-4D3C-8BD7-8734200E0D1E} = {4AA67AB0-C331-4CB2-9C00-B74F5DE31658}
@@ -186,6 +210,8 @@ Global
                {124152F8-FAE6-4D4B-87B9-6074DD365E9B} = {16439374-B8DB-4643-8116-EB3358B49A12}
                {7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5} = {16439374-B8DB-4643-8116-EB3358B49A12}
                {1D2A1968-8F04-4BE0-B03A-573F1F68AB66} = {16439374-B8DB-4643-8116-EB3358B49A12}
+               {615FD107-F5F0-4C0D-8D3F-C6F53D50273C} = {16439374-B8DB-4643-8116-EB3358B49A12}
+               {901AC007-7646-4171-A302-23E45C428F15} = {16439374-B8DB-4643-8116-EB3358B49A12}
        EndGlobalSection
        GlobalSection(MonoDevelopProperties) = preSolution
                Policies = $0
index cbdc7414e13ec8b7d0112bd4e891435b5fd86286..e6ab58e25f7d41200343d9dac3c16b8cac861ff9 100644 (file)
@@ -166,5 +166,41 @@ namespace vke {
                        name.Unpin ();
                }
                #endregion
+
+               #region shaderc
+               public static ShaderInfo CreateShaderInfo (this shaderc.Compiler comp, Device dev, string shaderPath, shaderc.ShaderKind shaderKind,
+                       SpecializationInfo specializationInfo = null, string entryPoint = "main") {
+
+                       using (shaderc.Result res = comp.Compile (shaderPath, shaderKind)) {
+                               Console.WriteLine ($"SpirV generation: {shaderPath} {res.Status}");
+                               if (res.Status != shaderc.Status.Success) 
+                                       throw new Exception ($"Shaderc compilation failure: {res.ErrorMessage}");
+                               VkShaderStageFlags stageFlags;
+                               switch (shaderKind) {
+                               case shaderc.ShaderKind.VertexShader:
+                                       stageFlags = VkShaderStageFlags.Vertex;
+                                       break;
+                               case shaderc.ShaderKind.FragmentShader:
+                                       stageFlags = VkShaderStageFlags.Fragment;
+                                       break;
+                               case shaderc.ShaderKind.ComputeShader:
+                                       stageFlags = VkShaderStageFlags.Compute;
+                                       break;
+                               case shaderc.ShaderKind.GeometryShader:
+                                       stageFlags = VkShaderStageFlags.Geometry;
+                                       break;
+                               case shaderc.ShaderKind.TessControlShader:
+                                       stageFlags = VkShaderStageFlags.TessellationControl;
+                                       break;
+                               case shaderc.ShaderKind.TessEvaluationShader:
+                                       stageFlags = VkShaderStageFlags.TessellationEvaluation;
+                                       break;
+                               default:
+                                       throw new NotSupportedException ($"shaderc compilation: shaderKind {shaderKind} not handled");
+                               }
+                               return new ShaderInfo (dev, stageFlags, res.CodePointer, (UIntPtr)res.CodeLength, specializationInfo, entryPoint);
+                       }
+               }
+               #endregion
        }
 }
index d95db2d843946a0075d639018a2bfb7999022478..9792dd8f728953bb5abeecf46ab7101595552194 100644 (file)
@@ -9,28 +9,48 @@ namespace vke {
        /// This class is a helper class for VkPipelineShaderStageCreateInfo creation.
        /// </summary>
        public class ShaderInfo : IDisposable {
-               public VkShaderStageFlags StageFlags;
-               public string SpirvPath;
-               public FixedUtf8String EntryPoint;
-               public SpecializationInfo SpecializationInfo;
+               readonly FixedUtf8String EntryPoint;
 
-               public ShaderInfo (VkShaderStageFlags _stageFlags, string _spirvPath, SpecializationInfo specializationInfo = null, string _entryPoint = "main") {
-                       StageFlags = _stageFlags;
-                       SpirvPath = _spirvPath;
-                       EntryPoint = new FixedUtf8String (_entryPoint);
-                       SpecializationInfo = specializationInfo;
+               internal VkPipelineShaderStageCreateInfo info = VkPipelineShaderStageCreateInfo.New ();
+               Device dev;
+               /// <summary>
+               /// Create a new 'ShaderInfo' object by providing a handle to an native memory holding the compiled SpirV code
+               /// and its size in byte.
+               /// </summary>
+               /// <param name="dev">Dev.</param>
+               /// <param name="stageFlags">Stage flags.</param>
+               /// <param name="code">a native pointer on the SpirV Code, typically a 'shaderc.Result.CodePointer</param>
+               /// <param name="codeSize">Code size in byte</param>
+               /// <param name="specializationInfo">Specialization info.</param>
+               /// <param name="entryPoint">shader entry point</param>
+               public ShaderInfo (Device dev, VkShaderStageFlags stageFlags, IntPtr code, UIntPtr codeSize, SpecializationInfo specializationInfo = null, string entryPoint = "main"):
+                       this(stageFlags, dev.CreateShaderModule (code, codeSize), specializationInfo, entryPoint) {
+                       this.dev = dev;//keep dev for destroying module created in this CTOR
+               }
+               /// <summary>
+               /// Create a new ShaderInfo object by providing the path to a compiled SpirV shader.
+               /// </summary>
+               /// <param name="dev">vke Device</param>
+               /// <param name="_stageFlags">Stage flags.</param>
+               /// <param name="_spirvPath">path to a compiled SpirV Shader on disk or as embedded ressource if path starts with '#'</param>
+               /// <param name="specializationInfo">Specialization info</param>
+               /// <param name="entryPoint">shader entry point, 'main' by default.</param>
+               public ShaderInfo (Device dev, VkShaderStageFlags _stageFlags, string _spirvPath, SpecializationInfo specializationInfo = null, string entryPoint = "main"):
+                       this(_stageFlags, dev.CreateShaderModule (_spirvPath), specializationInfo, entryPoint) {
+                       this.dev = dev;//keep dev for destroying module created in this CTOR
                }
                /// <summary>
-               /// Create the VkPipelineShaderStageCreateInfo structure. Note that the ShaderModule is created here and has to be destroy after the pipeline creation
+               /// Create a new ShaderInfo object by providing directly a VkShaderModule. Note
+               /// that this module will not be own by this ShaderInfo, and so will not be
+               /// destroyed on Dispose.
                /// </summary>
-               public VkPipelineShaderStageCreateInfo GetStageCreateInfo (Device dev) {
-                       return new VkPipelineShaderStageCreateInfo {
-                               sType = VkStructureType.PipelineShaderStageCreateInfo,
-                               stage = StageFlags,
-                               pName = EntryPoint,
-                               module = dev.LoadSPIRVShader (SpirvPath),
-                               pSpecializationInfo = (SpecializationInfo == null) ? IntPtr.Zero : SpecializationInfo.InfosPtr
-                       };
+               public ShaderInfo (VkShaderStageFlags stageFlags, VkShaderModule module, SpecializationInfo specializationInfo = null, string entryPoint = "main") {
+                       EntryPoint = new FixedUtf8String (entryPoint);
+
+                       info.stage = stageFlags;
+                       info.pName = EntryPoint;
+                       info.module = module;
+                       info.pSpecializationInfo = (specializationInfo == null) ? IntPtr.Zero : specializationInfo.InfosPtr;
                }
 
                #region IDisposable Support
@@ -38,9 +58,13 @@ namespace vke {
 
                protected virtual void Dispose (bool disposing) {
                        if (!disposedValue) {
-                               if (disposing) {
+                               if (disposing) 
                                        EntryPoint.Dispose ();
-                               }
+                               else
+                                       System.Diagnostics.Debug.WriteLine ("VKE ShaderInfo disposed by finalizer");
+
+                               dev?.DestroyShaderModule (info.module);
+
                                disposedValue = true;
                        }
                }
index 876aee666ccac2496b74b8491a78635d4c1e8415..5735e3f3440058aac3ccc8eda91bb906cea6c775 100644 (file)
@@ -31,10 +31,10 @@ namespace vke {
                                layout.Activate ();
                                Cache?.Activate ();
 
-                               using (ShaderInfo shader = new ShaderInfo (VkShaderStageFlags.Compute, SpirVPath)) {
+                               using (ShaderInfo shader = new ShaderInfo (Dev, VkShaderStageFlags.Compute, SpirVPath)) {
                                        VkComputePipelineCreateInfo info = VkComputePipelineCreateInfo.New ();
                                        info.layout = layout.Handle;
-                                       info.stage = shader.GetStageCreateInfo (Dev);
+                                       info.stage = shader.info;
                                        info.basePipelineHandle = 0;
                                        info.basePipelineIndex = 0;
 
index a5ebc395741dacb507bd3e39944f2f16d68db7d2..074a96080ec140f554f55a89145d9cdbf85f53e0 100644 (file)
@@ -26,13 +26,17 @@ namespace vke {
                        cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat);
                        cfg.blendAttachments[0] = new VkPipelineColorBlendAttachmentState (true);
 
-                       cfg.AddShader (VkShaderStageFlags.Vertex, "#vke.debug.vert.spv");
-                       cfg.AddShader (VkShaderStageFlags.Fragment, "#vke.debug.frag.spv");
+                       cfg.AddShaders (
+                               new ShaderInfo (Dev, VkShaderStageFlags.Vertex, "#vke.debug.vert.spv"),
+                               new ShaderInfo (Dev, VkShaderStageFlags.Fragment, "#vke.debug.frag.spv")
+                       );
 
                        layout = cfg.Layout;
 
                        init (cfg);
 
+                       cfg.DisposeShaders ();
+
                        Vertices = new HostBuffer (Dev, VkBufferUsageFlags.VertexBuffer, vboLength);
                        Vertices.Map ();
                }
index 2970257d1d5f88e8150f7c4b1df5de681cc13d00..081c0eaa6215968dde59d1604f423a57f4b24bc9 100644 (file)
@@ -8,7 +8,7 @@ using static Vulkan.Vk;
 
 namespace vke {
        [Serializable]
-    public sealed class DescriptorPool : Activable {        
+    public sealed class DescriptorPool : Activable {
         internal VkDescriptorPool handle;
                public uint MaxSets;
                public List<VkDescriptorPoolSize> PoolSizes { get; private set; } = new List<VkDescriptorPoolSize> ();
@@ -44,11 +44,11 @@ namespace vke {
                public sealed override void Activate () {
                        if (state != ActivableState.Activated) {            
                                VkDescriptorPoolCreateInfo info = VkDescriptorPoolCreateInfo.New();
-                   info.poolSizeCount = (uint)PoolSizes.Count;
-                   info.pPoolSizes = PoolSizes.Pin ();
-                   info.maxSets = MaxSets;
+                               info.poolSizeCount = (uint)PoolSizes.Count;
+                               info.pPoolSizes = PoolSizes.Pin ();
+                               info.maxSets = MaxSets;
 
-                   Utils.CheckResult (vkCreateDescriptorPool (Dev.VkDev, ref info, IntPtr.Zero, out handle));
+                               Utils.CheckResult (vkCreateDescriptorPool (Dev.VkDev, ref info, IntPtr.Zero, out handle));
                                PoolSizes.Unpin ();
                        }
                        base.Activate ();
index 78bd080f7cf8c1b1afdbe34b423b5481f567c375..2151656e322f0862bab62fc57745c4e429bf15af 100644 (file)
@@ -186,12 +186,12 @@ namespace vke {
                /// </summary>
                /// <returns>the vulkan shader module.</returns>
                /// <param name="filename">path of the spv shader.</param>
-        public VkShaderModule LoadSPIRVShader (string filename) {
+        public VkShaderModule CreateShaderModule (string filename) {
                        using (Stream stream = Utils.GetStreamFromPath (filename)) {
                                using (BinaryReader br = new BinaryReader (stream)) {
                                        byte[] shaderCode = br.ReadBytes ((int)stream.Length);
                                        UIntPtr shaderSize = (UIntPtr)shaderCode.Length;
-                                       VkShaderModule shaderModule = LoadSPIRVShader (shaderCode.Pin (), shaderSize);
+                                       VkShaderModule shaderModule = CreateShaderModule (shaderCode.Pin (), shaderSize);
                                        shaderCode.Unpin ();
                                        return shaderModule;
                                }
@@ -200,9 +200,10 @@ namespace vke {
         /// Load spirv code from unmanaged native pointer.
         /// </summary>
         /// <returns>the vulkan shader module.</returns>
-        /// <param name="code">unmanaged pointer holding the spirv code.</param>
+        /// <param name="code">unmanaged pointer holding the spirv code. Pointer must stay valid only during
+               /// the call to this method.</param>
         /// <param name="codeSize">spirv code byte size.</param>
-               public VkShaderModule LoadSPIRVShader (IntPtr code, UIntPtr codeSize) {
+               public VkShaderModule CreateShaderModule (IntPtr code, UIntPtr codeSize) {
                        VkShaderModuleCreateInfo moduleCreateInfo = VkShaderModuleCreateInfo.New ();
                        moduleCreateInfo.codeSize = codeSize;
                        moduleCreateInfo.pCode = code;
index 0eb031a9f8221085112079d9e4765141ac6b05bf..d1fe6c00a3c92f24d4b97c46b58966c3338ff4ae 100644 (file)
@@ -21,7 +21,7 @@ namespace vke {
                }       
 
                protected override VkDebugUtilsObjectNameInfoEXT DebugUtilsInfo
-                       => new VkDebugUtilsObjectNameInfoEXT (VkObjectType.Framebuffer, handle.Handle);
+                       => new VkDebugUtilsObjectNameInfoEXT (VkObjectType.Fence, handle.Handle);
 
                public sealed override void Activate () {
                        if (state != ActivableState.Activated) {
index 6658cc11bd71330e72d09cd6b840053bfff6c192..2e2d4edb16a62fc35dfc6335c6304c1c33533237 100644 (file)
@@ -43,8 +43,8 @@ namespace vke {
                                Cache?.Activate ();
 
                                List<VkPipelineShaderStageCreateInfo> shaderStages = new List<VkPipelineShaderStageCreateInfo> ();
-                               foreach (ShaderInfo shader in cfg.shaders)
-                                       shaderStages.Add (shader.GetStageCreateInfo (Dev));
+                               foreach (ShaderInfo shader in cfg.Shaders)
+                                       shaderStages.Add (shader.info);
 
                                using (PinnedObjects pctx = new PinnedObjects ()) {
 
@@ -94,14 +94,11 @@ namespace vke {
                                        info.pViewportState = viewportState.Pin (pctx);
                                        info.pDepthStencilState = cfg.depthStencilState.Pin (pctx);
                                        info.pDynamicState = dynStatesInfo.Pin (pctx);
-                                       info.stageCount = (uint)cfg.shaders.Count;
+                                       info.stageCount = (uint)cfg.Shaders.Count;
                                        info.pStages = shaderStages.Pin (pctx);
                                        info.subpass = cfg.SubpassIndex;
 
                                        Utils.CheckResult (vkCreateGraphicsPipelines (Dev.VkDev, Cache == null ? VkPipelineCache.Null : Cache.handle, 1, ref info, IntPtr.Zero, out handle));
-
-                                       for (int i = 0; i < cfg.shaders.Count; i++)
-                                               Dev.DestroyShaderModule (shaderStages[i].module);
                                }
                        }
                        base.Activate ();
index e96756e065d49a1dc41854f320df4c350ec810e7..b899946477bd5658e90a09fa877efe14af951bce 100644 (file)
@@ -45,7 +45,13 @@ namespace vke {
                public List<VkDynamicState> dynamicStates = new List<VkDynamicState> ();
                public List<VkVertexInputBindingDescription> vertexBindings = new List<VkVertexInputBindingDescription> ();
                public List<VkVertexInputAttributeDescription> vertexAttributes = new List<VkVertexInputAttributeDescription> ();
-               public List<ShaderInfo> shaders = new List<ShaderInfo> ();
+               /// <summary>
+               /// List of ShaderInfo's used to in this pipeline configuration. Those shaders have to be Disposed
+               /// after pipeline creation from this configuration. The 'DisposeShaders' helper method with clear the list.
+               /// To replace a single shader between two use of this configuration object to create two different pipelines, use
+               /// the 'ReplaceShader' helper method to automatically dispose the replace shader.
+               /// </summary>
+               public List<ShaderInfo> Shaders = new List<ShaderInfo> ();
                public VkBool32 ColorBlendLogicOpEnable = false;
                public VkLogicOp ColorBlendLogicOp;
                public Vector4 ColorBlendConstants;
@@ -135,27 +141,67 @@ namespace vke {
                                attribs[i] = fields[i].GetCustomAttribute<VertexAttributeAttribute> ().Format;
                        AddVertexAttributes (binding, attribs);
                }
-               public void AddShader (VkShaderStageFlags _stageFlags, string _spirvPath, SpecializationInfo specializationInfo = null, string _entryPoint = "main") {
-                       shaders.Add (new ShaderInfo (_stageFlags, _spirvPath, specializationInfo, _entryPoint));
+               /// <summary>
+               /// Add shaders to this pipeline configuration. 
+               /// </summary>
+               public void AddShaders (params ShaderInfo[] shaderInfos) {
+                       Shaders.AddRange (shaderInfos);
+               }
+               /// <summary>
+               /// Add a new shader to this pipeline configuration. 
+               /// </summary>
+               public void AddShader (VkShaderStageFlags stageFlags, VkShaderModule module, SpecializationInfo specializationInfo = null, string entryPoint = "main") {
+                       Shaders.Add (new ShaderInfo (stageFlags, module, specializationInfo, entryPoint));
+               }
+               /// <summary>
+               /// Add a new shader to this pipeline configuration. 
+               /// </summary>
+               public void AddShader (Device dev, VkShaderStageFlags stageFlags, string spirvShaderPath, SpecializationInfo specializationInfo = null, string entryPoint = "main") {
+                       Shaders.Add (new ShaderInfo (dev, stageFlags, spirvShaderPath, specializationInfo, entryPoint));
+               }
+               /// <summary>
+               /// Dispose ShaderInfo at index 'shaderIndex' in the Shaders list, and replace it
+               /// with the new 'ShaderInfo' given in arguments.
+               /// </summary>
+               /// <param name="shaderIndex">ShaderInfo index in the Shaders list of this configuration object</param>
+               /// <param name="info">the new Shader to use.</param>
+               public void ReplaceShader (int shaderIndex, ShaderInfo info) {
+                       Shaders[shaderIndex].Dispose ();
+                       Shaders[shaderIndex] = info;
+               }
+               /// <summary>
+               /// Dispose ShaderInfo at index 'shaderIndex' in the Shaders list, and replace it with a new one.
+               /// </summary>
+               public void ReplaceShader (int shaderIndex, VkShaderStageFlags stageFlags, VkShaderModule module, SpecializationInfo specializationInfo = null, string entryPoint = "main") {
+                       Shaders[shaderIndex].Dispose ();
+                       Shaders[shaderIndex] = new ShaderInfo (stageFlags, module, specializationInfo, entryPoint);
+               }
+               /// <summary>
+               /// Dispose ShaderInfo at index 'shaderIndex' in the Shaders list, and replace it with a new one.
+               /// </summary>
+               public void ReplaceShader (int shaderIndex, Device dev, VkShaderStageFlags stageFlags, string spirvShaderPath, SpecializationInfo specializationInfo = null, string entryPoint = "main") {
+                       Shaders[shaderIndex].Dispose ();
+                       Shaders[shaderIndex] = new ShaderInfo (dev, stageFlags, spirvShaderPath, specializationInfo, entryPoint);
                }
+
                /// <summary>
-               /// Resets shaders and vertices in current configuration to ease reuse of
-               /// current 'GraphicPipelineConfig' for creating another pipeline.
+               /// Dispose shaders and reset vertices in current configuration to ease reuse of
+               /// current 'GraphicPipelineConfig' for creating other similar pipeline.
                /// </summary>
                public void ResetShadersAndVerticesInfos () {
                        currentAttributeIndex = 0;
                        vertexBindings.Clear ();
                        vertexAttributes.Clear ();
-                       ResetShaders ();
+                       DisposeShaders ();
                }
                /// <summary>
                /// Resets shaders in current config to ease reause of current 'GraphicPipelineConfig
                /// for creating another similar pipeline with different shaders.
                /// </summary>
-               public void ResetShaders () {
-                       foreach (ShaderInfo shader in shaders)
+               public void DisposeShaders () {
+                       foreach (ShaderInfo shader in Shaders)
                                shader.Dispose ();
-                       shaders.Clear ();
+                       Shaders.Clear ();
                }
        }
 }
index 000a160f3197a59b36017c888e2af398deadf457..08427942ef98c7821343cb39bdf99e3f7ecf1247 100644 (file)
@@ -600,7 +600,7 @@ namespace vke {
                        case VkImageLayout.ColorAttachmentOptimal:
                                // Image will be used as a color attachment
                                // Make sure any writes to the color buffer have been finished
-                               imageMemoryBarrier.srcAccessMask = VkAccessFlags.TransferRead;
+                               imageMemoryBarrier.srcAccessMask = oldImageLayout == VkImageLayout.ShaderReadOnlyOptimal ? VkAccessFlags.ShaderRead : VkAccessFlags.TransferRead;
                                imageMemoryBarrier.dstAccessMask = VkAccessFlags.ColorAttachmentWrite;
                                break;
 
index 850fb11d701e4fe4e37327b601feca86529f4331..ca08d454e45ad7086cf00af717a05b7b839a5d0a 100644 (file)
        
        <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
                <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />          
-               <PackageReference Include="glfw-sharp" Version="0.2.0" />
-               <PackageReference Include="shaderc" Version="0.1.0-beta" />
        </ItemGroup>
                
        <ItemGroup>
                <PackageReference Include="SpirVTasks" Version="$(SpirVTasksPackageVersion)" />
                <PackageReference Include="Vulkan" Version="0.2.2.2-beta" />
+               <PackageReference Include="glfw-sharp" Version="0.2.2" />
+               <PackageReference Include="shaderc.net" Version="0.1.0" />
        </ItemGroup>
        <ItemGroup>
                <GLSLShader Include="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom" />