Update naga to c69f676

This commit is contained in:
Dzmitry Malyshau 2021-12-04 12:22:57 -05:00
parent 35be31f02a
commit 9bbea3d348
5 changed files with 9 additions and 9 deletions

2
Cargo.lock generated
View File

@ -872,7 +872,7 @@ dependencies = [
[[package]]
name = "naga"
version = "0.7.1"
source = "git+https://github.com/gfx-rs/naga?rev=29571cc#29571cc4cfbb28558948b1b31ad764f55b69f37b"
source = "git+https://github.com/gfx-rs/naga?rev=c69f676#c69f67660973a3bffa3b27c295f698dc4aa01524"
dependencies = [
"bit-set",
"bitflags",

View File

@ -37,7 +37,7 @@ thiserror = "1"
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "29571cc"
rev = "c69f676"
#version = "0.7"
features = ["span", "validate", "wgsl-in"]

View File

@ -75,12 +75,12 @@ js-sys = { version = "0.3" }
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "29571cc"
rev = "c69f676"
#version = "0.7"
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "29571cc"
rev = "c69f676"
#version = "0.7"
features = ["wgsl-in"]

View File

@ -35,9 +35,9 @@ fn vs_main([[builtin(vertex_index)]] vi: u32) -> VertexOutput {
[[group(0), binding(1)]]
var texture: texture_2d<f32>;
[[group(0), binding(2)]]
var sampler: sampler;
var sam: sampler;
[[stage(fragment)]]
fn fs_main(in: VertexOutput) -> [[location(0)]] vec4<f32> {
return in.color * textureSampleLevel(texture, sampler, in.tex_coords, 0.0);
return in.color * textureSampleLevel(texture, sam, in.tex_coords, 0.0);
}

View File

@ -135,20 +135,20 @@ env_logger = "0.8"
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "29571cc"
rev = "c69f676"
#version = "0.7"
optional = true
# used to test all the example shaders
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "29571cc"
rev = "c69f676"
#version = "0.7"
features = ["wgsl-in"]
[target.'cfg(target_arch = "wasm32")'.dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "29571cc"
rev = "c69f676"
#version = "0.7"
features = ["wgsl-out"]