From eba4cd977b253910ef198a485b19d05cde72cca1 Mon Sep 17 00:00:00 2001 From: Kunal Mohan Date: Thu, 30 Jul 2020 22:48:31 +0530 Subject: [PATCH] [rs] Replace NonZeroU32 with u32 in TextureViewDescriptor --- wgpu/Cargo.toml | 4 ++-- wgpu/examples/mipmap/main.rs | 40 ++++++++++++++------------------ wgpu/examples/shadow/main.rs | 44 ++++++++++++++++-------------------- wgpu/src/backend/direct.rs | 12 +++++----- wgpu/src/backend/web.rs | 5 ++-- 5 files changed, 47 insertions(+), 58 deletions(-) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 109c92c728..bb57f7f71b 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -27,14 +27,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan"] package = "wgpu-core" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "9929b8719ff9c15a96adbf279fcbf3e943f23c78" +rev = "9e4839eb049707629fa8a91e3603085433f352a4" features = ["raw-window-handle"] [dependencies.wgt] package = "wgpu-types" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "9929b8719ff9c15a96adbf279fcbf3e943f23c78" +rev = "9e4839eb049707629fa8a91e3603085433f352a4" [dependencies] arrayvec = "0.5" diff --git a/wgpu/examples/mipmap/main.rs b/wgpu/examples/mipmap/main.rs index 1486a2b179..79d2a29f97 100644 --- a/wgpu/examples/mipmap/main.rs +++ b/wgpu/examples/mipmap/main.rs @@ -2,7 +2,7 @@ mod framework; use bytemuck::{Pod, Zeroable}; -use std::{borrow::Cow::Borrowed, num::NonZeroU32}; +use std::borrow::Cow::Borrowed; use wgpu::util::DeviceExt; const TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba8UnormSrgb; @@ -160,7 +160,7 @@ impl Example { dimension: wgpu::TextureViewDimension::D2, aspect: wgpu::TextureAspect::All, base_mip_level: mip, - level_count: NonZeroU32::new(1), + level_count: Some(1), base_array_layer: 0, array_layer_count: None, }) @@ -215,13 +215,11 @@ impl framework::Example for Example { // Create the vertex and index buffers let vertex_size = mem::size_of::(); let vertex_data = create_vertices(); - let vertex_buf = device.create_buffer_init( - &wgpu::util::BufferInitDescriptor { - label: Some("Vertex Buffer"), - contents: bytemuck::cast_slice(&vertex_data), - usage: wgpu::BufferUsage::VERTEX, - } - ); + let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some("Vertex Buffer"), + contents: bytemuck::cast_slice(&vertex_data), + usage: wgpu::BufferUsage::VERTEX, + }); // Create pipeline layout let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { @@ -279,13 +277,11 @@ impl framework::Example for Example { let texture_view = texture.create_default_view(); //Note: we could use queue.write_texture instead, and this is what other // examples do, but here we want to show another way to do this. - let temp_buf = device.create_buffer_init( - &wgpu::util::BufferInitDescriptor { - label: Some("Temporary Buffer"), - contents: texels.as_slice(), - usage: wgpu::BufferUsage::COPY_SRC, - } - ); + let temp_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some("Temporary Buffer"), + contents: texels.as_slice(), + usage: wgpu::BufferUsage::COPY_SRC, + }); init_encoder.copy_buffer_to_texture( wgpu::BufferCopyView { buffer: &temp_buf, @@ -316,13 +312,11 @@ impl framework::Example for Example { }); let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32); let mx_ref: &[f32; 16] = mx_total.as_ref(); - let uniform_buf = device.create_buffer_init( - &wgpu::util::BufferInitDescriptor { - label: Some("Uniform Buffer"), - contents: bytemuck::cast_slice(mx_ref), - usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST, - } - ); + let uniform_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some("Uniform Buffer"), + contents: bytemuck::cast_slice(mx_ref), + usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST, + }); // Create bind group let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor { diff --git a/wgpu/examples/shadow/main.rs b/wgpu/examples/shadow/main.rs index b71047a7c1..1340a8e97f 100644 --- a/wgpu/examples/shadow/main.rs +++ b/wgpu/examples/shadow/main.rs @@ -1,4 +1,4 @@ -use std::{borrow::Cow::Borrowed, iter, mem, num::NonZeroU32, ops::Range, rc::Rc}; +use std::{borrow::Cow::Borrowed, iter, mem, ops::Range, rc::Rc}; #[path = "../framework.rs"] mod framework; @@ -221,7 +221,7 @@ impl framework::Example for Example { label: Some("Cubes Vertex Buffer"), contents: bytemuck::cast_slice(&cube_vertex_data), usage: wgpu::BufferUsage::VERTEX, - } + }, )); let cube_index_buf = Rc::new(device.create_buffer_init( @@ -229,25 +229,21 @@ impl framework::Example for Example { label: Some("Cubes Index Buffer"), contents: bytemuck::cast_slice(&cube_index_data), usage: wgpu::BufferUsage::INDEX, - } + }, )); let (plane_vertex_data, plane_index_data) = create_plane(7); - let plane_vertex_buf = device.create_buffer_init( - &wgpu::util::BufferInitDescriptor { - label: Some("Plane Vertex Buffer"), - contents: bytemuck::cast_slice(&plane_vertex_data), - usage: wgpu::BufferUsage::VERTEX, - } - ); + let plane_vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some("Plane Vertex Buffer"), + contents: bytemuck::cast_slice(&plane_vertex_data), + usage: wgpu::BufferUsage::VERTEX, + }); - let plane_index_buf = device.create_buffer_init( - &wgpu::util::BufferInitDescriptor { - label: Some("Plane Index Buffer"), - contents: bytemuck::cast_slice(&plane_index_data), - usage: wgpu::BufferUsage::INDEX, - } - ); + let plane_index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some("Plane Index Buffer"), + contents: bytemuck::cast_slice(&plane_index_data), + usage: wgpu::BufferUsage::INDEX, + }); let entity_uniform_size = mem::size_of::() as wgpu::BufferAddress; let plane_uniform_buf = device.create_buffer(&wgpu::BufferDescriptor { @@ -395,7 +391,7 @@ impl framework::Example for Example { base_mip_level: 0, level_count: None, base_array_layer: i as u32, - array_layer_count: NonZeroU32::new(1), + array_layer_count: Some(1), })) }) .collect::>(); @@ -581,13 +577,11 @@ impl framework::Example for Example { proj: *mx_total.as_ref(), num_lights: [lights.len() as u32, 0, 0, 0], }; - let uniform_buf = device.create_buffer_init( - &wgpu::util::BufferInitDescriptor { - label: Some("Uniform Buffer"), - contents: bytemuck::bytes_of( &forward_uniforms), - usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST, - } - ); + let uniform_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some("Uniform Buffer"), + contents: bytemuck::bytes_of(&forward_uniforms), + usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST, + }); // Create bind group let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor { diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs index d2e11a3a78..0883dc0e48 100644 --- a/wgpu/src/backend/direct.rs +++ b/wgpu/src/backend/direct.rs @@ -10,13 +10,12 @@ use futures::future::{ready, Ready}; use smallvec::SmallVec; use std::{ borrow::Cow::{self, Borrowed}, + error::Error, ffi::CString, - fmt, - marker::PhantomData, - ops::Range, - ptr, - slice, - error::Error + fmt, + marker::PhantomData, + ops::Range, + ptr, slice, }; use typed_arena::Arena; @@ -837,6 +836,7 @@ impl crate::Context for Context { }, PhantomData )) + .unwrap_pretty() } fn device_create_render_bundle_encoder( diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs index 97169e8b85..1b0a34f5e2 100644 --- a/wgpu/src/backend/web.rs +++ b/wgpu/src/backend/web.rs @@ -307,6 +307,7 @@ fn map_texture_format(texture_format: wgt::TextureFormat) -> web_sys::GpuTexture TextureFormat::Depth32Float => tf::Depth32float, TextureFormat::Depth24Plus => tf::Depth24plus, TextureFormat::Depth24PlusStencil8 => tf::Depth24plusStencil8, + _ => unimplemented!(), } } @@ -1201,11 +1202,11 @@ impl crate::Context for Context { mapped_desc.aspect(map_texture_aspect(d.aspect)); mapped_desc.base_array_layer(d.base_array_layer); if let Some(count) = d.array_layer_count { - mapped_desc.array_layer_count(count.get()); + mapped_desc.array_layer_count(count); } mapped_desc.base_mip_level(d.base_mip_level); if let Some(count) = d.level_count { - mapped_desc.mip_level_count(count.get()); + mapped_desc.mip_level_count(count); } // TODO: label texture.0.create_view_with_descriptor(&mapped_desc)