From b87e50feaed8cf02f71da34e284c3c2147ef5666 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Wed, 23 Feb 2022 15:56:34 -0500 Subject: [PATCH] Rename get_downlevel_properties to get_downlevel_capabilities --- wgpu-core/src/instance.rs | 2 +- wgpu-info/src/main.rs | 2 +- wgpu/examples/framework.rs | 2 +- wgpu/examples/shadow/main.rs | 2 +- wgpu/src/backend/direct.rs | 4 ++-- wgpu/src/backend/web.rs | 2 +- wgpu/src/lib.rs | 6 +++--- wgpu/tests/common/mod.rs | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wgpu-core/src/instance.rs b/wgpu-core/src/instance.rs index f525d2eed0..565173703f 100644 --- a/wgpu-core/src/instance.rs +++ b/wgpu-core/src/instance.rs @@ -878,7 +878,7 @@ impl Global { .map_err(|_| InvalidAdapter) } - pub fn adapter_downlevel_properties( + pub fn adapter_downlevel_capabilities( &self, adapter_id: AdapterId, ) -> Result { diff --git a/wgpu-info/src/main.rs b/wgpu-info/src/main.rs index 769fdfe753..833670f7ac 100644 --- a/wgpu-info/src/main.rs +++ b/wgpu-info/src/main.rs @@ -8,7 +8,7 @@ use std::{ #[rustfmt::skip] fn print_info_from_adapter(adapter: &wgpu::Adapter, idx: usize) { let info = adapter.get_info(); - let downlevel = adapter.get_downlevel_properties(); + let downlevel = adapter.get_downlevel_capabilities(); let features = adapter.features(); let limits = adapter.limits(); diff --git a/wgpu/examples/framework.rs b/wgpu/examples/framework.rs index c19e2066ec..3a50656a4c 100644 --- a/wgpu/examples/framework.rs +++ b/wgpu/examples/framework.rs @@ -151,7 +151,7 @@ async fn setup(title: &str) -> Setup { ); let required_downlevel_capabilities = E::required_downlevel_capabilities(); - let downlevel_capabilities = adapter.get_downlevel_properties(); + let downlevel_capabilities = adapter.get_downlevel_capabilities(); assert!( downlevel_capabilities.shader_model >= required_downlevel_capabilities.shader_model, "Adapter does not support the minimum shader model required to run this example: {:?}", diff --git a/wgpu/examples/shadow/main.rs b/wgpu/examples/shadow/main.rs index 53daf5e237..b6219f6b71 100644 --- a/wgpu/examples/shadow/main.rs +++ b/wgpu/examples/shadow/main.rs @@ -220,7 +220,7 @@ impl framework::Example for Example { _queue: &wgpu::Queue, ) -> Self { let supports_storage_resources = adapter - .get_downlevel_properties() + .get_downlevel_capabilities() .flags .contains(wgpu::DownlevelFlags::VERTEX_STORAGE) && device.limits().max_storage_buffers_per_shader_stage > 0; diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs index e0dfea8923..82336dc070 100644 --- a/wgpu/src/backend/direct.rs +++ b/wgpu/src/backend/direct.rs @@ -882,9 +882,9 @@ impl crate::Context for Context { } } - fn adapter_downlevel_properties(&self, adapter: &Self::AdapterId) -> DownlevelCapabilities { + fn adapter_downlevel_capabilities(&self, adapter: &Self::AdapterId) -> DownlevelCapabilities { let global = &self.0; - match wgc::gfx_select!(*adapter => global.adapter_downlevel_properties(*adapter)) { + match wgc::gfx_select!(*adapter => global.adapter_downlevel_capabilities(*adapter)) { Ok(downlevel) => downlevel, Err(err) => self.handle_error_fatal(err, "Adapter::downlevel_properties"), } diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs index 9f3e55edba..dd5800d8b3 100644 --- a/wgpu/src/backend/web.rs +++ b/wgpu/src/backend/web.rs @@ -1157,7 +1157,7 @@ impl crate::Context for Context { } } - fn adapter_downlevel_properties( + fn adapter_downlevel_capabilities( &self, _adapter: &Self::AdapterId, ) -> wgt::DownlevelCapabilities { diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index d940164619..8e23f43efc 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -218,7 +218,7 @@ trait Context: Debug + Send + Sized + Sync { ) -> bool; fn adapter_features(&self, adapter: &Self::AdapterId) -> Features; fn adapter_limits(&self, adapter: &Self::AdapterId) -> Limits; - fn adapter_downlevel_properties(&self, adapter: &Self::AdapterId) -> DownlevelCapabilities; + fn adapter_downlevel_capabilities(&self, adapter: &Self::AdapterId) -> DownlevelCapabilities; fn adapter_get_info(&self, adapter: &Self::AdapterId) -> AdapterInfo; fn adapter_get_texture_format_features( &self, @@ -1671,8 +1671,8 @@ impl Adapter { } /// Get info about the adapter itself. - pub fn get_downlevel_properties(&self) -> DownlevelCapabilities { - Context::adapter_downlevel_properties(&*self.context, &self.id) + pub fn get_downlevel_capabilities(&self) -> DownlevelCapabilities { + Context::adapter_downlevel_capabilities(&*self.context, &self.id) } /// Returns the features supported for a given texture format by this adapter. diff --git a/wgpu/tests/common/mod.rs b/wgpu/tests/common/mod.rs index 9993d3bc92..b9a9b63507 100644 --- a/wgpu/tests/common/mod.rs +++ b/wgpu/tests/common/mod.rs @@ -161,7 +161,7 @@ pub fn initialize_test(parameters: TestParameters, test_function: impl FnOnce(Te let adapter_lowercase_name = adapter_info.name.to_lowercase(); let adapter_features = adapter.features(); let adapter_limits = adapter.limits(); - let adapter_downlevel_properties = adapter.get_downlevel_properties(); + let adapter_downlevel_capabilities = adapter.get_downlevel_capabilities(); let missing_features = parameters.required_features - adapter_features; if !missing_features.is_empty() { @@ -175,7 +175,7 @@ pub fn initialize_test(parameters: TestParameters, test_function: impl FnOnce(Te } let missing_downlevel_flags = - parameters.required_downlevel_properties.flags - adapter_downlevel_properties.flags; + parameters.required_downlevel_properties.flags - adapter_downlevel_capabilities.flags; if !missing_downlevel_flags.is_empty() { println!( "TEST SKIPPED: MISSING DOWNLEVEL FLAGS {:?}", @@ -184,12 +184,12 @@ pub fn initialize_test(parameters: TestParameters, test_function: impl FnOnce(Te return; } - if adapter_downlevel_properties.shader_model + if adapter_downlevel_capabilities.shader_model < parameters.required_downlevel_properties.shader_model { println!( "TEST SKIPPED: LOW SHADER MODEL {:?}", - adapter_downlevel_properties.shader_model + adapter_downlevel_capabilities.shader_model ); return; }