[rs] Merge #80

80: Update to the new swapchain model r=trivial a=kvark

Fixes #74 
Fixes https://github.com/gfx-rs/wgpu/issues/292

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
This commit is contained in:
bors[bot] 2019-09-10 01:44:55 +00:00 committed by GitHub
commit 559e5ceb33
2 changed files with 1 additions and 6 deletions

View File

@ -21,7 +21,7 @@ license = "MPL-2.0"
default = []
[dependencies]
wgn = { package = "wgpu-native", git = "https://github.com/gfx-rs/wgpu", rev = "40fb3fcdfd38a3788bb1a358301dc9010778651b" }
wgn = { package = "wgpu-native", git = "https://github.com/gfx-rs/wgpu", rev = "499bf1d2686ad25b5a5133d6433e4f4c9179ff0b" }
arrayvec = "0.4"
raw-window-handle = "0.1"
zerocopy = "0.2"

View File

@ -431,7 +431,6 @@ pub struct RenderPassColorAttachmentDescriptor<'a> {
/// A swap chain image that can be rendered to.
#[derive(Debug)]
pub struct SwapChainOutput<'a> {
pub texture: Texture,
pub view: TextureView,
swap_chain_id: &'a wgn::SwapChainId,
}
@ -1332,10 +1331,6 @@ impl SwapChain {
pub fn get_next_texture(&mut self) -> SwapChainOutput {
let output = wgn::wgpu_swap_chain_get_next_texture(self.id);
SwapChainOutput {
texture: Texture {
id: output.texture_id,
owned: false,
},
view: TextureView {
id: output.view_id,
owned: false,