github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Update wgpu with another bind group fix, updated power preference

Browse Source
This commit is contained in:
Dzmitry Malyshau
2020-10-13 16:47:23 -04:00
parent 42bb7ca65f
commit c115aed4cc
8 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wgpu/Cargo.toml
View File

@@ -26,14 +26,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan", "gfx-backend-vulkan"]
package = "wgpu-core"
#version = "0.6"
git = "https://github.com/gfx-rs/wgpu"
rev = "44a41dc9a4eac8ddc37675f0d52486ded27bdbb3"
rev = "7ac706f0a9d90ebdcffeae48e3c530b9921bff2c"
features = ["raw-window-handle"]
[dependencies.wgt]
package = "wgpu-types"
#version = "0.6"
git = "https://github.com/gfx-rs/wgpu"
rev = "44a41dc9a4eac8ddc37675f0d52486ded27bdbb3"
rev = "7ac706f0a9d90ebdcffeae48e3c530b9921bff2c"
[dependencies]
arrayvec = "0.5"

5
wgpu/examples/capture/main.rs
View File

@@ -29,10 +29,7 @@ async fn create_red_image_with_dimensions(
height: usize,
) -> (Device, Buffer, BufferDimensions) {
let adapter = wgpu::Instance::new(wgpu::BackendBit::PRIMARY)
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
compatible_surface: None,
})
.request_adapter(&wgpu::RequestAdapterOptions::default())
.await
.unwrap();

2
wgpu/examples/framework.rs
View File

@@ -129,7 +129,7 @@ async fn setup<E: Example>(title: &str) -> Setup {
};
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await

5
wgpu/examples/hello-compute/main.rs
View File

@@ -26,10 +26,7 @@ async fn execute_gpu(numbers: Vec<u32>) -> Vec<u32> {
// `request_adapter` instantiates the general connection to the GPU
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
compatible_surface: None,
})
.request_adapter(&wgpu::RequestAdapterOptions::default())
.await
.unwrap();

2
wgpu/examples/hello-triangle/main.rs
View File

@@ -10,7 +10,7 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::
let surface = unsafe { instance.create_surface(&window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
// Request an adapter which can render to our surface
compatible_surface: Some(&surface),
})

2
wgpu/examples/hello-windows/main.rs
View File

@@ -74,7 +74,7 @@ async fn run(
.collect();
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
// Request an adapter which can render to our surface
compatible_surface: viewports.first().map(|desc| &desc.surface),
})

5
wgpu/examples/hello/main.rs
View File

@@ -2,10 +2,7 @@
async fn run() {
#[cfg_attr(target_arch = "wasm32", allow(unused_variables))]
let adapter = wgpu::Instance::new(wgpu::BackendBit::PRIMARY)
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
compatible_surface: None,
})
.request_adapter(&wgpu::RequestAdapterOptions::default())
.await
.unwrap();

4
wgpu/src/backend/web.rs
View File

@@ -791,9 +791,7 @@ impl crate::Context for Context {
let mut mapped_options = web_sys::GpuRequestAdapterOptions::new();
let mapped_power_preference = match options.power_preference {
wgt::PowerPreference::LowPower => web_sys::GpuPowerPreference::LowPower,
wgt::PowerPreference::HighPerformance | wgt::PowerPreference::Default => {
web_sys::GpuPowerPreference::HighPerformance
}
wgt::PowerPreference::HighPerformance => web_sys::GpuPowerPreference::HighPerformance,
};
mapped_options.power_preference(mapped_power_preference);
let adapter_promise = self.0.request_adapter_with_options(&mapped_options);