diff --git a/src/backend/metal/src/command.rs b/src/backend/metal/src/command.rs
index 92dec31c9c3..ae8b4711807 100644
--- a/src/backend/metal/src/command.rs
+++ b/src/backend/metal/src/command.rs
@@ -1,4 +1,7 @@
-use {AutoreleasePool, Backend, PrivateDisabilities, Shared, validate_line_width, BufferPtr, TexturePtr};
+use {
+ AutoreleasePool, Backend, PrivateDisabilities, Shared, validate_line_width,
+ BufferPtr, TexturePtr, SamplerPtr,
+};
use {conversions as conv, native, soft, window};
use internal::{BlitVertex, Channel, ClearKey, ClearVertex, ServicePipes};
@@ -208,7 +211,7 @@ impl State {
.zip(render_resources)
.flat_map(move |(&stage, resources)| {
let com_buffers = resources.buffers.iter().enumerate().filter_map(move |(i, resource)| {
- resource.as_ref().map(|&(buffer, offset)| {
+ resource.map(|(buffer, offset)| {
soft::RenderCommand::BindBuffer {
stage,
index: i as _,
@@ -227,11 +230,11 @@ impl State {
})
});
let com_samplers = resources.samplers.iter().enumerate().filter_map(move |(i, resource)| {
- resource.as_ref().map(|sampler| {
+ resource.map(|sampler| {
soft::RenderCommand::BindSampler {
stage,
index: i as _,
- sampler: Some(&**sampler),
+ sampler: Some(sampler),
}
})
});
@@ -265,7 +268,7 @@ impl State {
.iter()
.enumerate()
.filter_map(|(i, resource)| {
- resource.as_ref().map(|&(buffer, offset)| {
+ resource.map(|(buffer, offset)| {
soft::ComputeCommand::BindBuffer {
index: i as _,
buffer: Some(buffer),
@@ -288,10 +291,10 @@ impl State {
.iter()
.enumerate()
.filter_map(|(i, ref resource)| {
- resource.as_ref().map(|sampler| {
+ resource.map(|sampler| {
soft::ComputeCommand::BindSampler {
index: i as _,
- sampler: Some(&**sampler),
+ sampler: Some(sampler),
}
})
});
@@ -346,7 +349,7 @@ impl State {
.enumerate()
.filter_map(move |(index, maybe_buffer)| {
if mask & (1u64 << index) != 0 {
- maybe_buffer.as_ref().map(|&(buffer, offset)| {
+ maybe_buffer.map(|(buffer, offset)| {
soft::RenderCommand::BindBuffer {
stage: pso::Stage::Vertex,
index,
@@ -535,7 +538,7 @@ impl State {
struct StageResources {
buffers: Vec