Graphics: Make use of shader binding sets

This commit is contained in:
Jérôme Leclercq
2021-06-16 14:47:54 +02:00
parent 5559fe1af7
commit 3cd9172f7a
49 changed files with 592 additions and 792 deletions

View File

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

View File

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

View File

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

View File

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

Binary file not shown.

Binary file not shown.

46
bin/resources/gamma.nzsl Normal file
View File

@@ -0,0 +1,46 @@
external
{
[binding(0)] colorTexture: sampler2D<f32>
}
struct FragIn
{
[location(0)] uv: vec2<f32>
}
struct FragOut
{
[location(0)] color: vec4<f32>
}
struct VertIn
{
[location(0)] pos: vec3<f32>,
[location(1)] uv: vec2<f32>
}
struct VertOut
{
[location(0)] vertUV: vec2<f32>,
[builtin(position)] position: vec4<f32>
}
[entry(frag)]
fn main(input: FragIn) -> FragOut
{
let gamma = 2.2;
let output: FragOut;
output.color = colorTexture.Sample(input.uv);
//output.color = pow(colorTexture.Sample(input.uv), vec4<f32>(1.0 / gamma, 1.0 / gamma, 1.0 / gamma, 1.0));
return output;
}
[entry(vert)]
fn main(input: VertIn) -> VertOut
{
let output: VertOut;
output.position = vec4<f32>(input.pos, 1.0);
output.vertUV = input.uv;
return output;
}

View File

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

View File

@@ -38,13 +38,24 @@ struct ViewerData
eyePosition: vec3<f32>
}
[set(0)]
external
{
[binding(0)] viewerData: uniform<ViewerData>
}
[set(1)]
external
{
[binding(0)] colorTexture: sampler2D<f32>,
[binding(1)] normalTexture: sampler2D<f32>,
[binding(2)] positionTexture: sampler2D<f32>,
[binding(3)] lightParameters: uniform<SpotLight>,
[binding(4)] viewerData: uniform<ViewerData>
}
[set(2)]
external
{
[binding(0)] lightParameters: uniform<SpotLight>,
}
struct FragIn

View File

@@ -14,7 +14,7 @@ struct ViewerData
external
{
[binding(1)] skybox: samplerCube<f32>
[set(1), binding(0)] skybox: samplerCube<f32>
}
struct VertOut
@@ -42,7 +42,7 @@ fn main(input: VertOut) -> FragOut
external
{
[binding(0)] viewerData: uniform<ViewerData>
[set(0), binding(0)] viewerData: uniform<ViewerData>
}
struct VertIn