From 7c290fdd8d7e1520cc8ab7f64f6b2a4098dd31bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20B=C3=B6l=C3=B6ny?= Date: Mon, 9 Nov 2020 10:35:55 +0100 Subject: [PATCH] [rs] Rename TextureUsage::OUTPUT_ATTACHMENT to RENDER_ATTACHMENT --- wgpu/examples/capture/main.rs | 2 +- wgpu/examples/framework.rs | 2 +- wgpu/examples/hello-triangle/main.rs | 2 +- wgpu/examples/hello-windows/main.rs | 2 +- wgpu/examples/mipmap/main.rs | 2 +- wgpu/examples/msaa-line/main.rs | 2 +- wgpu/examples/shadow/main.rs | 6 +++--- wgpu/examples/water/main.rs | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wgpu/examples/capture/main.rs b/wgpu/examples/capture/main.rs index 7425833e13..b56ddc25e3 100644 --- a/wgpu/examples/capture/main.rs +++ b/wgpu/examples/capture/main.rs @@ -71,7 +71,7 @@ async fn create_red_image_with_dimensions( sample_count: 1, dimension: wgpu::TextureDimension::D2, format: wgpu::TextureFormat::Rgba8UnormSrgb, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::COPY_SRC, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::COPY_SRC, label: None, }); diff --git a/wgpu/examples/framework.rs b/wgpu/examples/framework.rs index a849b755aa..095cf0a29a 100644 --- a/wgpu/examples/framework.rs +++ b/wgpu/examples/framework.rs @@ -207,7 +207,7 @@ fn start( }; let mut sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, // TODO: Allow srgb unconditionally format: if cfg!(target_arch = "wasm32") { wgpu::TextureFormat::Bgra8Unorm diff --git a/wgpu/examples/hello-triangle/main.rs b/wgpu/examples/hello-triangle/main.rs index 9c31204432..8cd6a98676 100644 --- a/wgpu/examples/hello-triangle/main.rs +++ b/wgpu/examples/hello-triangle/main.rs @@ -66,7 +66,7 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu:: }); let mut sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: swapchain_format, width: size.width, height: size.height, diff --git a/wgpu/examples/hello-windows/main.rs b/wgpu/examples/hello-windows/main.rs index b6e8c6d73f..d165f3f688 100644 --- a/wgpu/examples/hello-windows/main.rs +++ b/wgpu/examples/hello-windows/main.rs @@ -31,7 +31,7 @@ impl ViewportDesc { let size = self.window.inner_size(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: swapchain_format, width: size.width, height: size.height, diff --git a/wgpu/examples/mipmap/main.rs b/wgpu/examples/mipmap/main.rs index 23044295a4..bcb5d7c201 100644 --- a/wgpu/examples/mipmap/main.rs +++ b/wgpu/examples/mipmap/main.rs @@ -208,7 +208,7 @@ impl framework::Example for Example { dimension: wgpu::TextureDimension::D2, format: TEXTURE_FORMAT, usage: wgpu::TextureUsage::SAMPLED - | wgpu::TextureUsage::OUTPUT_ATTACHMENT + | wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::COPY_DST, label: None, }); diff --git a/wgpu/examples/msaa-line/main.rs b/wgpu/examples/msaa-line/main.rs index 6b0bfde5c9..d256163f2a 100644 --- a/wgpu/examples/msaa-line/main.rs +++ b/wgpu/examples/msaa-line/main.rs @@ -109,7 +109,7 @@ impl Example { sample_count: sample_count, dimension: wgpu::TextureDimension::D2, format: sc_desc.format, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, label: None, }; diff --git a/wgpu/examples/shadow/main.rs b/wgpu/examples/shadow/main.rs index 9e2fc7a0aa..4082029bb6 100644 --- a/wgpu/examples/shadow/main.rs +++ b/wgpu/examples/shadow/main.rs @@ -354,7 +354,7 @@ impl framework::Example for Example { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::SHADOW_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED, label: None, }); let shadow_view = shadow_texture.create_view(&wgpu::TextureViewDescriptor::default()); @@ -641,7 +641,7 @@ impl framework::Example for Example { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, label: None, }); @@ -687,7 +687,7 @@ impl framework::Example for Example { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, label: None, }); self.forward_depth = depth_texture.create_view(&wgpu::TextureViewDescriptor::default()); diff --git a/wgpu/examples/water/main.rs b/wgpu/examples/water/main.rs index 1e4ce25c36..6b4555a9ab 100644 --- a/wgpu/examples/water/main.rs +++ b/wgpu/examples/water/main.rs @@ -199,7 +199,7 @@ impl Example { format: sc_desc.format, usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST - | wgpu::TextureUsage::OUTPUT_ATTACHMENT, + | wgpu::TextureUsage::RENDER_ATTACHMENT, }); let draw_depth_buffer = device.create_texture(&wgpu::TextureDescriptor { @@ -211,7 +211,7 @@ impl Example { format: wgpu::TextureFormat::Depth32Float, usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST - | wgpu::TextureUsage::OUTPUT_ATTACHMENT, + | wgpu::TextureUsage::RENDER_ATTACHMENT, }); let sampler = device.create_sampler(&wgpu::SamplerDescriptor {