Skip to content

Commit ff213e1

Browse files
committed
Merge pull request #633 from kvark/resource
Resource tracking and destruction
2 parents 7656ee4 + 5a823fb commit ff213e1

File tree

10 files changed

+418
-242
lines changed

10 files changed

+418
-242
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
[package]
1616
name = "gfx"
17-
version = "0.2.1"
17+
version = "0.2.2"
1818
description = "A high-performance, bindless graphics API"
1919
homepage = "https://github.com/gfx-rs/gfx-rs"
2020
repository = "https://github.com/gfx-rs/gfx-rs"

src/device/draw.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ pub trait CommandBuffer<R: Resources> {
9696
/// Unbind any surface from the specified target slot
9797
fn unbind_target(&mut self, Access, Target);
9898
/// Bind a surface to the specified target slot
99-
fn bind_target_surface(&mut self, Access, Target,
100-
R::Surface);
99+
fn bind_target_surface(&mut self, Access, Target, R::Surface);
101100
/// Bind a level of the texture to the specified target slot
102101
fn bind_target_texture(&mut self, Access, Target, R::Texture,
103102
target::Level, Option<target::Layer>);
@@ -109,7 +108,7 @@ pub trait CommandBuffer<R: Resources> {
109108
fn bind_uniform(&mut self, shade::Location, shade::UniformValue);
110109
/// Bind a texture
111110
fn bind_texture(&mut self, super::TextureSlot, tex::TextureKind,
112-
R::Texture, Option<::SamplerHandle<R>>);
111+
R::Texture, Option<(R::Sampler, tex::SamplerInfo)>);
113112
/// Select, which color buffers are going to be targetted by the shader
114113
fn set_draw_color_buffers(&mut self, usize);
115114
/// Set primitive topology

0 commit comments

Comments
 (0)