sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DeferredShading demo

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-10-20 23:50:39 +02:00
parent e84ec8e4ac
commit a18415216b
8 changed files with 85 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/resources/bloom_bright.nzsl
View File

@@ -15,7 +15,7 @@ struct ViewerData
external
{
[set(0), binding(0)] viewerData: uniform<ViewerData>,
[set(1), binding(0)] colorTexture: sampler2D<f32>,
[set(0), binding(1)] colorTexture: sampler2D<f32>,
}
struct FragIn

4
bin/resources/bloom_final.nzsl
View File

@@ -15,8 +15,8 @@ struct ViewerData
external
{
[set(0), binding(0)] viewerData: uniform<ViewerData>,
[set(1), binding(0)] colorTexture: sampler2D<f32>,
[set(1), binding(1)] bloomTexture: sampler2D<f32>,
[set(0), binding(1)] colorTexture: sampler2D<f32>,
[set(0), binding(2)] bloomTexture: sampler2D<f32>,
}
struct FragIn

11
bin/resources/deferred_frag.nzsl
View File

@@ -32,11 +32,12 @@ struct ViewerData
external
{
[set(0), binding(0)] viewerData: uniform<ViewerData>,
[set(1), binding(0)] instanceData: uniform<InstanceData>,
[set(2), binding(0)] settings: uniform<BasicSettings>,
[set(2), binding(2)] MaterialAlphaMap: sampler2D<f32>,
[set(2), binding(1)] MaterialDiffuseMap: sampler2D<f32>
[binding(0)] settings: uniform<BasicSettings>,
[binding(1)] MaterialDiffuseMap: sampler2D<f32>,
[binding(2)] MaterialAlphaMap: sampler2D<f32>,
[binding(3)] TextureOverlay: sampler2D<f32>,
[binding(4)] instanceData: uniform<InstanceData>,
[binding(5)] viewerData: uniform<ViewerData>,
}
struct InputData

6
bin/resources/deferred_vert.nzsl
View File

@@ -28,9 +28,9 @@ struct ViewerData
external
{
[set(0), binding(0)] viewerData: uniform<ViewerData>,
[set(1), binding(0)] instanceData: uniform<InstanceData>,
[set(2), binding(0)] settings: uniform<BasicSettings>,
[binding(0)] settings: uniform<BasicSettings>,
[binding(4)] instanceData: uniform<InstanceData>,
[binding(5)] viewerData: uniform<ViewerData>,
}
struct InputData

2
bin/resources/gaussian_blur.nzsl
View File

@@ -15,7 +15,7 @@ struct ViewerData
external
{
[set(0), binding(0)] viewerData: uniform<ViewerData>,
[set(1), binding(0)] colorTexture: sampler2D<f32>,
[set(0), binding(1)] colorTexture: sampler2D<f32>,
}
struct FragIn

13
bin/resources/lighting.nzsl
View File

@@ -41,19 +41,14 @@ struct ViewerData
[set(0)]
external
{
[binding(0)] viewerData: uniform<ViewerData>
[binding(0)] viewerData: uniform<ViewerData>,
[binding(1)] colorTexture: sampler2D<f32>,
[binding(2)] normalTexture: sampler2D<f32>,
[binding(3)] positionTexture: sampler2D<f32>,
}
[set(1)]
external
{
[binding(0)] colorTexture: sampler2D<f32>,
[binding(1)] normalTexture: sampler2D<f32>,
[binding(2)] positionTexture: sampler2D<f32>,
}
[set(2)]
external
{
[binding(0)] lightParameters: uniform<SpotLight>,
}

8
bin/resources/skybox.nzsl
View File

@@ -14,7 +14,8 @@ struct ViewerData
external
{
[set(1), binding(0)] skybox: samplerCube<f32>
[binding(0)] viewerData: uniform<ViewerData>,
[binding(1)] skybox: samplerCube<f32>
}
struct VertOut
@@ -40,11 +41,6 @@ fn main(input: VertOut) -> FragOut
return output;
}
external
{
[set(0), binding(0)] viewerData: uniform<ViewerData>
}
struct VertIn
{
[location(0)] position: vec3<f32>