From 6485e81f4bb542c60e931d27e8bb55901578db6f Mon Sep 17 00:00:00 2001 From: Gordon-F Date: Thu, 25 Mar 2021 21:56:22 +0300 Subject: [PATCH] [rs] Enable EXPERIMENTAL_TRANSLATION with GL backend for some examples --- wgpu/examples/boids/main.rs | 2 +- wgpu/examples/cube/main.rs | 2 +- wgpu/examples/hello-compute/main.rs | 2 +- wgpu/src/backend/error.rs | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/wgpu/examples/boids/main.rs b/wgpu/examples/boids/main.rs index c84dd6cd58..7048d6fb18 100644 --- a/wgpu/examples/boids/main.rs +++ b/wgpu/examples/boids/main.rs @@ -37,7 +37,7 @@ impl framework::Example for Example { // load and compile the shader let mut flags = wgpu::ShaderFlags::VALIDATION; match adapter.get_info().backend { - wgt::Backend::Vulkan | wgt::Backend::Metal => { + wgt::Backend::Vulkan | wgt::Backend::Metal | wgt::Backend::Gl => { flags |= wgpu::ShaderFlags::EXPERIMENTAL_TRANSLATION; } _ => {} //TODO diff --git a/wgpu/examples/cube/main.rs b/wgpu/examples/cube/main.rs index bb6670dda0..df565702cc 100644 --- a/wgpu/examples/cube/main.rs +++ b/wgpu/examples/cube/main.rs @@ -250,7 +250,7 @@ impl framework::Example for Example { let mut flags = wgpu::ShaderFlags::VALIDATION; match adapter.get_info().backend { - wgpu::Backend::Metal | wgpu::Backend::Vulkan => { + wgpu::Backend::Metal | wgpu::Backend::Vulkan | wgpu::Backend::Gl => { flags |= wgpu::ShaderFlags::EXPERIMENTAL_TRANSLATION } _ => (), //TODO diff --git a/wgpu/examples/hello-compute/main.rs b/wgpu/examples/hello-compute/main.rs index 6e70c0236c..79523677a2 100644 --- a/wgpu/examples/hello-compute/main.rs +++ b/wgpu/examples/hello-compute/main.rs @@ -58,7 +58,7 @@ async fn execute_gpu(numbers: Vec) -> Vec { // Loads the shader from the SPIR-V file.arrayvec let mut flags = wgpu::ShaderFlags::VALIDATION; match adapter.get_info().backend { - wgpu::Backend::Vulkan | wgpu::Backend::Metal => { + wgpu::Backend::Vulkan | wgpu::Backend::Metal | wgpu::Backend::Gl => { flags |= wgpu::ShaderFlags::EXPERIMENTAL_TRANSLATION; } _ => {} diff --git a/wgpu/src/backend/error.rs b/wgpu/src/backend/error.rs index e02fa2170a..df4ac0e037 100644 --- a/wgpu/src/backend/error.rs +++ b/wgpu/src/backend/error.rs @@ -22,8 +22,7 @@ impl Error for ContextError { impl super::Context { pub(super) fn format_error(&self, err: &(impl Error + 'static)) -> String { - let mut err_descs = Vec::new(); - err_descs.push(self.format_pretty_any(err)); + let mut err_descs = vec![self.format_pretty_any(err)]; let mut source_opt = err.source(); while let Some(source) = source_opt {