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

Upgrade wgpu

Browse Source
This commit is contained in:
Maximilian Ammann 2022-10-08 20:56:58 +02:00
parent 1461832df3
commit a68acbdff3
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maplibre-build-tools/Cargo.toml
View File

@ -12,7 +12,7 @@ readme = "../README.md"
sqlite = ["rusqlite"] sqlite = ["rusqlite"]
[dependencies] [dependencies]
naga = { git = "https://github.com/gfx-rs/naga", branch = "master", features = ["wgsl-in"] } naga = { version = "*", features = ["wgsl-in"] }
walkdir = "2.3.2" walkdir = "2.3.2"
log = "0.4.17" log = "0.4.17"
rusqlite = { version = "0.27.0", optional = true } rusqlite = { version = "0.27.0", optional = true }

2
maplibre/Cargo.toml
View File

@ -51,7 +51,7 @@ geozero = { version = "0.9.5", default-features = false, features = ["with-mvt",
tile-grid = "0.3.0" tile-grid = "0.3.0"
# Rendering # Rendering
wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "94ce763" } wgpu = "0.14.0"
lyon = { version = "1.0.0", features = [] } lyon = { version = "1.0.0", features = [] }
raw-window-handle = "0.5.0" raw-window-handle = "0.5.0"

2
maplibre/src/render/resource/surface.rs
View File

@ -2,6 +2,7 @@
//! a handle to a window. A headless surface renders to a texture. //! a handle to a window. A headless surface renders to a texture.
use std::{mem::size_of, sync::Arc}; use std::{mem::size_of, sync::Arc};
use wgpu::CompositeAlphaMode;
use crate::{ use crate::{
render::{eventually::HasChanged, resource::texture::TextureView, settings::RendererSettings}, render::{eventually::HasChanged, resource::texture::TextureView, settings::RendererSettings},
@ -133,6 +134,7 @@ impl Surface {
{ {
let size = window.size(); let size = window.size();
let surface_config = wgpu::SurfaceConfiguration { let surface_config = wgpu::SurfaceConfiguration {
alpha_mode: CompositeAlphaMode::Auto,
usage: wgpu::TextureUsages::RENDER_ATTACHMENT, usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
format: settings.texture_format, format: settings.texture_format,
width: size.width(), width: size.width(),

2
web/Cargo.toml
View File

@ -27,7 +27,7 @@ rand = { version = "0.7", features = ["wasm-bindgen"] }
console_error_panic_hook = "0.1.7" console_error_panic_hook = "0.1.7"
# Exact version requirement can be removed as soon as https://github.com/gfx-rs/wgpu/pull/2954 is merged # Exact version requirement can be removed as soon as https://github.com/gfx-rs/wgpu/pull/2954 is merged
web-sys = { version = "=0.3.58", features = [ web-sys = { version = "0.3.58", features = [
"Window", "Window",
"Worker", "WorkerGlobalScope", "DedicatedWorkerGlobalScope", "MessageEvent", "Worker", "WorkerGlobalScope", "DedicatedWorkerGlobalScope", "MessageEvent",
"Request", "RequestInit", "RequestMode", "Response", "Headers", "Request", "RequestInit", "RequestMode", "Response", "Headers",