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

[rs] made fields of direct::Context private

Browse Source
This commit is contained in:
Andrea Nardi
2020-07-22 21:41:17 +02:00
parent 050abe522f
commit fb48ff51c3
2 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,43 @@ use smallvec::SmallVec;
use std::{ffi::CString, fmt, marker::PhantomData, ops::Range, ptr, slice};
use typed_arena::Arena;
pub struct Context(pub wgc::hub::Global<wgc::hub::IdentityManagerFactory>);
pub struct Context(wgc::hub::Global<wgc::hub::IdentityManagerFactory>);
impl Context {
pub fn adapter_get_info(&self, id: wgc::id::AdapterId) -> wgc::instance::AdapterInfo {
let global = &self.0;
wgc::gfx_select!(id => global.adapter_get_info(id))
}
pub fn enumerate_adapters(&self, backends: wgt::BackendBit) -> Vec<wgc::id::AdapterId> {
self.0
.enumerate_adapters(wgc::instance::AdapterInputs::Mask(backends, |_| {
PhantomData
}))
}
#[cfg(any(target_os = "ios", target_os = "macos"))]
pub unsafe fn create_surface_from_core_animation_layer(
&self,
layer: *mut std::ffi::c_void,
) -> crate::Surface {
let surface = wgc::instance::Surface {
#[cfg(feature = "vulkan-portability")]
vulkan: None, //TODO: create_surface_from_layer ?
metal: self.0.instance.metal.as_ref().map(|inst| {
inst.create_surface_from_layer(layer as *mut _, cfg!(debug_assertions))
}),
};
crate::Surface {
id: self.0.surfaces.register_identity(
PhantomData,
surface,
&mut wgc::hub::Token::root(),
),
}
}
}
impl fmt::Debug for Context {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

24
wgpu/src/lib.rs
View File

@@ -1020,10 +1020,7 @@ impl Instance {
pub fn enumerate_adapters(&self, backends: BackendBit) -> impl Iterator<Item = Adapter> {
let context = Arc::clone(&self.context);
self.context
.0
.enumerate_adapters(wgc::instance::AdapterInputs::Mask(backends, |_| {
PhantomData
}))
.enumerate_adapters(backends)
.into_iter()
.map(move |id| crate::Adapter {
id,
@@ -1070,21 +1067,7 @@ impl Instance {
&self,
layer: *mut std::ffi::c_void,
) -> Surface {
let surface = wgc::instance::Surface {
#[cfg(feature = "vulkan-portability")]
vulkan: None, //TODO: create_surface_from_layer ?
metal: self.context.0.instance.metal.as_ref().map(|inst| {
inst.create_surface_from_layer(layer as *mut _, cfg!(debug_assertions))
}),
};
crate::Surface {
id: self.context.0.surfaces.register_identity(
PhantomData,
surface,
&mut wgc::hub::Token::root(),
),
}
self.context.create_surface_from_core_animation_layer(layer)
}
}
@@ -1146,8 +1129,7 @@ impl Adapter {
/// Get info about the adapter itself.
#[cfg(not(target_arch = "wasm32"))]
pub fn get_info(&self) -> AdapterInfo {
let global = &self.context.0;
wgc::gfx_select!(self.id => global.adapter_get_info(self.id))
self.context.adapter_get_info(self.id)
}
}