Skip to content

Commit

Permalink
merge that merged merge till its really merged
Browse files Browse the repository at this point in the history
  • Loading branch information
robtfm committed Oct 17, 2023
1 parent 624df5f commit b070027
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions crates/bevy_render/src/render_resource/bind_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ use crate::{
pub use bevy_render_macros::AsBindGroup;
use encase::ShaderType;
use std::ops::Deref;
use wgpu::{
BindGroupDescriptor, BindGroupEntry, BindGroupLayoutDescriptor, BindGroupLayoutEntry,
BindingResource,
};
use wgpu::{BindGroupEntry, BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingResource};

define_atomic_id!(BindGroupId);
render_resource_wrapper!(ErasedBindGroup, wgpu::BindGroup);
Expand Down Expand Up @@ -289,11 +286,7 @@ pub trait AsBindGroup {
})
.collect::<Vec<_>>();

let bind_group = render_device.create_bind_group(&BindGroupDescriptor {
label: Self::label(),
layout,
entries: &entries,
});
let bind_group = render_device.create_bind_group(Self::label(), layout, &entries);

Ok(PreparedBindGroup {
bindings,
Expand Down

0 comments on commit b070027

Please sign in to comment.