814f8d1635
# Objective - Update wgpu to 0.13 - ~~Wait, is wgpu 0.13 released? No, but I had most of the changes already ready since playing with webgpu~~ well it has been released now - Also update parking_lot to 0.12 and naga to 0.9 ## Solution - Update syntax for wgsl shaders https://github.com/gfx-rs/wgpu/blob/master/CHANGELOG.md#wgsl-syntax - Add a few options, remove some references: https://github.com/gfx-rs/wgpu/blob/master/CHANGELOG.md#other-breaking-changes - fragment inputs should now exactly match vertex outputs for locations, so I added exports for those to be able to reuse them https://github.com/gfx-rs/wgpu/pull/2704
56 lines
1.5 KiB
WebGPU Shading Language
56 lines
1.5 KiB
WebGPU Shading Language
#import bevy_pbr::mesh_view_bindings
|
|
#import bevy_pbr::mesh_bindings
|
|
|
|
#import bevy_pbr::pbr_types
|
|
#import bevy_pbr::utils
|
|
#import bevy_pbr::clustered_forward
|
|
#import bevy_pbr::lighting
|
|
#import bevy_pbr::shadows
|
|
#import bevy_pbr::pbr_functions
|
|
|
|
@group(1) @binding(0)
|
|
var my_array_texture: texture_2d_array<f32>;
|
|
@group(1) @binding(1)
|
|
var my_array_texture_sampler: sampler;
|
|
|
|
struct FragmentInput {
|
|
@builtin(front_facing) is_front: bool,
|
|
@builtin(position) frag_coord: vec4<f32>,
|
|
#import bevy_pbr::mesh_vertex_output
|
|
};
|
|
|
|
@fragment
|
|
fn fragment(in: FragmentInput) -> @location(0) vec4<f32> {
|
|
let layer = i32(in.world_position.x) & 0x3;
|
|
|
|
// Prepare a 'processed' StandardMaterial by sampling all textures to resolve
|
|
// the material members
|
|
var pbr_input: PbrInput = pbr_input_new();
|
|
|
|
pbr_input.material.base_color = textureSample(my_array_texture, my_array_texture_sampler, in.uv, layer);
|
|
#ifdef VERTEX_COLORS
|
|
pbr_input.material.base_color = pbr_input.material.base_color * in.color;
|
|
#endif
|
|
|
|
pbr_input.frag_coord = in.frag_coord;
|
|
pbr_input.world_position = in.world_position;
|
|
pbr_input.world_normal = in.world_normal;
|
|
|
|
pbr_input.is_orthographic = view.projection[3].w == 1.0;
|
|
|
|
pbr_input.N = prepare_normal(
|
|
pbr_input.material.flags,
|
|
in.world_normal,
|
|
#ifdef VERTEX_TANGENTS
|
|
#ifdef STANDARDMATERIAL_NORMAL_MAP
|
|
in.world_tangent,
|
|
#endif
|
|
#endif
|
|
in.uv,
|
|
in.is_front,
|
|
);
|
|
pbr_input.V = calculate_view(in.world_position, pbr_input.is_orthographic);
|
|
|
|
return tone_mapping(pbr(pbr_input));
|
|
}
|