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

Rename get_downlevel_properties to get_downlevel_capabilities

Browse Source
This commit is contained in:
Connor Fitzgerald
2022-02-23 15:56:34 -05:00
committed by Dzmitry Malyshau
parent 30dbc1d01f
commit b87e50feae
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wgpu-core/src/instance.rs
View File

@@ -878,7 +878,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
.map_err(|_| InvalidAdapter)
}
pub fn adapter_downlevel_properties<A: HalApi>(
pub fn adapter_downlevel_capabilities<A: HalApi>(
&self,
adapter_id: AdapterId,
) -> Result<wgt::DownlevelCapabilities, InvalidAdapter> {

2
wgpu-info/src/main.rs
View File

@@ -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();

2
wgpu/examples/framework.rs
View File

@@ -151,7 +151,7 @@ async fn setup<E: Example>(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: {:?}",

2
wgpu/examples/shadow/main.rs
View File

@@ -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;

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

@@ -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"),
}

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

@@ -1157,7 +1157,7 @@ impl crate::Context for Context {
}
}
fn adapter_downlevel_properties(
fn adapter_downlevel_capabilities(
&self,
_adapter: &Self::AdapterId,
) -> wgt::DownlevelCapabilities {

6
wgpu/src/lib.rs
View File

@@ -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.

8
wgpu/tests/common/mod.rs
View File

@@ -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;
}