Instantiated said pipeline and fixed shaders.

deanjl · deanjl · commit a4151473d20c · 2026-02-06T16:12:05.000+11:00
diff --git a/Nu/Nu.Gaia/Assets/Default/Irradiance.frag b/Nu/Nu.Gaia/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Nu/Nu.Gaia/Assets/Default/Irradiance.vert b/Nu/Nu.Gaia/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Nu/Nu.Pipe/Assets/Default/Irradiance.frag b/Nu/Nu.Pipe/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Nu/Nu.Pipe/Assets/Default/Irradiance.vert b/Nu/Nu.Pipe/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Nu/Nu.Template.ImSim.Empty/Assets/Default/Irradiance.frag b/Nu/Nu.Template.ImSim.Empty/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Nu/Nu.Template.ImSim.Empty/Assets/Default/Irradiance.vert b/Nu/Nu.Template.ImSim.Empty/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Nu/Nu.Template.ImSim.Game/Assets/Default/Irradiance.frag b/Nu/Nu.Template.ImSim.Game/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Nu/Nu.Template.ImSim.Game/Assets/Default/Irradiance.vert b/Nu/Nu.Template.ImSim.Game/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Nu/Nu.Template.Mmcc.Empty/Assets/Default/Irradiance.frag b/Nu/Nu.Template.Mmcc.Empty/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Nu/Nu.Template.Mmcc.Empty/Assets/Default/Irradiance.vert b/Nu/Nu.Template.Mmcc.Empty/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Nu/Nu.Template.Mmcc.Game/Assets/Default/Irradiance.frag b/Nu/Nu.Template.Mmcc.Game/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Nu/Nu.Template.Mmcc.Game/Assets/Default/Irradiance.vert b/Nu/Nu.Template.Mmcc.Game/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Nu/Nu.Tests/Assets/Default/Irradiance.frag b/Nu/Nu.Tests/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Nu/Nu.Tests/Assets/Default/Irradiance.vert b/Nu/Nu.Tests/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Nu/Nu/Render/Renderer3d.fs b/Nu/Nu/Render/Renderer3d.fs
@@ -5152,6 +5152,7 @@ type [<ReferenceEquality>] VulkanRenderer3d =
           LazyTextureQueues : ConcurrentDictionary<Texture.LazyTexture ConcurrentQueue, Texture.LazyTexture ConcurrentQueue>
           TextureServer : Texture.TextureServer
           mutable SkyBoxPipeline : SkyBox.SkyBoxPipeline
+          mutable IrradiancePipeline : CubeMap.CubeMapPipeline
           mutable PhysicallyBasedPipelines : PhysicallyBased.PhysicallyBasedPipelines
           ShadowMatrices : Matrix4x4 array
           LightShadowIndices : Dictionary<uint64, int>
@@ -6061,6 +6062,9 @@ type [<ReferenceEquality>] VulkanRenderer3d =
         let (compositionAttachment, compositionDepthAttachment) = physicallyBasedAttachments.CompositionAttachments
         let skyBoxPipeline = SkyBox.CreateSkyBoxPipeline compositionAttachment.Format compositionDepthAttachment.Format vkc
         
+        // create irradiance pipeline
+        let irradiancePipeline = CubeMap.CreateCubeMapPipeline (Constants.Paths.IrradianceShaderFilePath, compositionAttachment.Format, compositionDepthAttachment.Format, vkc)
+        
         // create physically-based pipelines
         let physicallyBasedPipelines = PhysicallyBased.CreatePhysicallyBasedPipelines (Constants.Render.LightMapsMaxDeferred, Constants.Render.LightsMaxDeferred, compositionAttachment.Format, compositionDepthAttachment.Format, vkc)
         
@@ -6215,6 +6219,7 @@ type [<ReferenceEquality>] VulkanRenderer3d =
               LazyTextureQueues = lazyTextureQueues
               TextureServer = textureServer
               SkyBoxPipeline = skyBoxPipeline
+              IrradiancePipeline = irradiancePipeline
               PhysicallyBasedPipelines = physicallyBasedPipelines
               ShadowMatrices = shadowMatrices
               LightShadowIndices = dictPlus HashIdentity.Structural []
@@ -6255,7 +6260,7 @@ type [<ReferenceEquality>] VulkanRenderer3d =
             let vkc = renderer.VulkanContext
             
             SkyBox.DestroySkyBoxPipeline renderer.SkyBoxPipeline vkc
-            
+            CubeMap.DestroyCubeMapPipeline (renderer.IrradiancePipeline, vkc)
             PhysicallyBased.DestroyPhysicallyBasedPipelines renderer.PhysicallyBasedPipelines vkc
             
             CubeMap.DestroyCubeMapGeometry renderer.CubeMapGeometry vkc
diff --git a/Projects/Blaze Vector ImSim/Assets/Default/Irradiance.frag b/Projects/Blaze Vector ImSim/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Blaze Vector ImSim/Assets/Default/Irradiance.vert b/Projects/Blaze Vector ImSim/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Blaze Vector Mmcc/Assets/Default/Irradiance.frag b/Projects/Blaze Vector Mmcc/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Blaze Vector Mmcc/Assets/Default/Irradiance.vert b/Projects/Blaze Vector Mmcc/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Breakout ImSim/Assets/Default/Irradiance.frag b/Projects/Breakout ImSim/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Breakout ImSim/Assets/Default/Irradiance.vert b/Projects/Breakout ImSim/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Breakout Mmcc/Assets/Default/Irradiance.frag b/Projects/Breakout Mmcc/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Breakout Mmcc/Assets/Default/Irradiance.vert b/Projects/Breakout Mmcc/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Jump Box/Assets/Default/Irradiance.frag b/Projects/Jump Box/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Jump Box/Assets/Default/Irradiance.vert b/Projects/Jump Box/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Metrics/Assets/Default/Irradiance.frag b/Projects/Metrics/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Metrics/Assets/Default/Irradiance.vert b/Projects/Metrics/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Nelmish/Assets/Default/Irradiance.frag b/Projects/Nelmish/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Nelmish/Assets/Default/Irradiance.vert b/Projects/Nelmish/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Sand Box 2d/Assets/Default/Irradiance.frag b/Projects/Sand Box 2d/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Sand Box 2d/Assets/Default/Irradiance.vert b/Projects/Sand Box 2d/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Terra Firma/Assets/Default/Irradiance.frag b/Projects/Terra Firma/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Terra Firma/Assets/Default/Irradiance.vert b/Projects/Terra Firma/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {
diff --git a/Projects/Twenty 48/Assets/Default/Irradiance.frag b/Projects/Twenty 48/Assets/Default/Irradiance.frag
@@ -11,7 +11,7 @@ layout(push_constant) uniform PushConstant
 
 layout(binding = 1) uniform samplerCube cubeMap[];
 
-in vec3 positionOut;
+layout(location = 0) in vec3 positionOut;
 
 layout(location = 0) out vec4 frag;
 
diff --git a/Projects/Twenty 48/Assets/Default/Irradiance.vert b/Projects/Twenty 48/Assets/Default/Irradiance.vert
@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock
 
 layout(location = 0) in vec3 position;
 
-out vec3 positionOut;
+layout(location = 0) out vec3 positionOut;
 
 void main()
 {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ layout(binding = 0) uniform TransformBlock`
`20`	`20`
`21`	`21`	`layout(location = 0) in vec3 position;`
`22`	`22`
`23`		`-out vec3 positionOut;`
	`23`	`+layout(location = 0) out vec3 positionOut;`
`24`	`24`
`25`	`25`	`void main()`
`26`	`26`	`{`