Skip to content
This repository has been archived by the owner on Jun 18, 2021. It is now read-only.

Commit

Permalink
Merge #68
Browse files Browse the repository at this point in the history 
68: remove usages of wgn in examples r=kvark a=rukai

This slipped through in #67

Co-authored-by: Rukai <rubickent@gmail.com>
  • Loading branch information
@bors @rukai
bors[bot] and rukai authored Aug 18, 2019
2 parents e2b6727 + 88965ef commit da6377a
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions examples/cube/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,23 @@ impl framework::Example for Example {
ty: wgpu::BindingType::UniformBuffer,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
wgpu::BindGroupLayoutBinding {
binding: 1,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::SampledTexture,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
wgpu::BindGroupLayoutBinding {
binding: 2,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::Sampler,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
],
});
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-compute/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fn main() {
ty: wgpu::BindingType::StorageBuffer,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
}],
});

Expand Down
10 changes: 5 additions & 5 deletions examples/mipmap/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ impl Example {
ty: wgpu::BindingType::SampledTexture,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
wgpu::BindGroupLayoutBinding {
binding: 1,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::Sampler,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
],
});
Expand Down Expand Up @@ -223,23 +223,23 @@ impl framework::Example for Example {
ty: wgpu::BindingType::UniformBuffer,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
wgpu::BindGroupLayoutBinding {
binding: 1,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::SampledTexture,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
wgpu::BindGroupLayoutBinding {
binding: 2,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::Sampler,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
],
});
Expand Down
12 changes: 6 additions & 6 deletions examples/shadow/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ impl framework::Example for Example {
ty: wgpu::BindingType::UniformBuffer,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
}],
});

Expand Down Expand Up @@ -414,7 +414,7 @@ impl framework::Example for Example {
ty: wgpu::BindingType::UniformBuffer,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
}],
});
let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
Expand Down Expand Up @@ -500,31 +500,31 @@ impl framework::Example for Example {
ty: wgpu::BindingType::UniformBuffer,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
wgpu::BindGroupLayoutBinding {
binding: 1, // lights
visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::UniformBuffer,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
wgpu::BindGroupLayoutBinding {
binding: 2,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::SampledTexture,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
wgpu::BindGroupLayoutBinding {
binding: 3,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::Sampler,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
},
],
});
Expand Down
2 changes: 1 addition & 1 deletion tests/multithreaded_compute.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ fn multithreaded_compute() {
ty: wgpu::BindingType::StorageBuffer,
dynamic: false,
multisampled: false,
texture_dimension: wgn::TextureViewDimension::D2,
texture_dimension: wgpu::TextureViewDimension::D2,
}],
});

Expand Down

0 comments on commit da6377a

Please sign in to comment.