archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix shaders for Chrome 113 (#270)

Browse Source
This commit is contained in:
Max Ammann 2023-04-08 18:27:39 -04:00 committed by GitHub
parent 04eca4b196
commit 28573ce470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maplibre/src/render/shaders/tile.vertex.wgsl
View File

@ -35,9 +35,9 @@ fn main(
// return VertexOutput(color, vec4<f32>(0.0, 0.0, 0.0, 1.0));
//}
var position = mat4x4<f32>(translate1, translate2, translate3, translate4) * vec4<f32>(position + normal * width, z, 1.0);
var final_position = mat4x4<f32>(translate1, translate2, translate3, translate4) * vec4<f32>(position + normal * width, z, 1.0);
// FIXME: how to fix z-fighting?
position.z = z_index;
final_position.z = z_index;
return VertexOutput(color, position);
return VertexOutput(color, final_position);
}

6
maplibre/src/render/shaders/tile_debug.vertex.wgsl
View File

@ -70,7 +70,7 @@ fn main(
vec3<f32>(0.0, 0.0, 1.0)
);
var position = mat4x4<f32>(translate1, translate2, translate3, translate4) * vec4<f32>((scaling * vertex), 1.0);
position.z = 1.0;
return VertexOutput(DEBUG_COLOR, position);
var final_position = mat4x4<f32>(translate1, translate2, translate3, translate4) * vec4<f32>((scaling * vertex), 1.0);
final_position.z = 1.0;
return VertexOutput(DEBUG_COLOR, final_position);
}

6
maplibre/src/render/shaders/tile_mask.vertex.wgsl
View File

@ -37,9 +37,9 @@ fn main(
vec3<f32>(0.0, 0.0, 1.0)
);
var position = mat4x4<f32>(translate1, translate2, translate3, translate4) * vec4<f32>((scaling * vertex), 1.0);
var final_position = mat4x4<f32>(translate1, translate2, translate3, translate4) * vec4<f32>((scaling * vertex), 1.0);
// FIXME: how to fix z-fighting?
position.z = 1.0;
final_position.z = 1.0;
return VertexOutput(DEBUG_COLOR, position);
return VertexOutput(DEBUG_COLOR, final_position);
}

6
maplibre/src/render/shaders/tile_raster.vertex.wgsl
View File

@ -41,8 +41,8 @@ fn main(
);
let tex_coords = TEX_COORDS[vertex_idx];
var position = mat4x4<f32>(translate1, translate2, translate3, translate4) * vec4<f32>(vertex, 1.0);
position.z = z_index;
var final_position = mat4x4<f32>(translate1, translate2, translate3, translate4) * vec4<f32>(vertex, 1.0);
final_position.z = z_index;
return VertexOutput(tex_coords, position);
return VertexOutput(tex_coords, final_position);
}

2
shell.nix
View File

@ -16,6 +16,8 @@ pkgs.mkShell {
# Tools
unstable.rustup
unstable.just
unstable.nodejs
unstable.wasm-bindgen-cli
unstable.tracy
unstable.nixpkgs-fmt # To format this file: nixpkgs-fmt *.nix
# System dependencies