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] Fix merge snafu

Browse Source
This commit is contained in:
kyren
2019-05-25 16:03:57 -04:00
parent 95659b1843
commit b76b81d9fa
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wgpu/src/lib.rs
View File

@@ -465,6 +465,13 @@ impl Instance {
}
}
#[cfg(feature = "gl")]
pub fn new(windowed_context: wgn::glutin::WindowedContext) -> Self {
Instance {
id: wgn::wgpu_create_gl_instance(windowed_context)
}
}
/// Retrieves an [`Adapter`] which matches the given descriptor.
///
/// If there are no available adapters matching `desc`, this function will return another
@@ -474,13 +481,6 @@ impl Instance {
///
/// Panics if there are no available adapters. This will occur if none of the graphics backends
/// are enabled.
#[cfg(feature = "gl")]
pub fn new(windowed_context: wgn::glutin::WindowedContext) -> Self {
Instance {
id: wgn::wgpu_create_gl_instance(windowed_context)
}
}
pub fn get_adapter(&self, desc: &AdapterDescriptor) -> Adapter {
Adapter {
id: wgn::wgpu_instance_get_adapter(self.id, desc),