Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-26 06:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix formatting / clippy warnings (#295)

Browse source
This commit is contained in:
multun 2020-08-22 18:35:40 -07:00 committed by GitHub
parent b925e22949
commit 022a31fd8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/bevy_pbr/src/render_graph/forward_pipeline/mod.rs
View file

@ -3,7 +3,7 @@ use bevy_render::{
pipeline::{ pipeline::{
BlendDescriptor, BlendFactor, BlendOperation, ColorStateDescriptor, ColorWrite, BlendDescriptor, BlendFactor, BlendOperation, ColorStateDescriptor, ColorWrite,
CompareFunction, CullMode, DepthStencilStateDescriptor, FrontFace, PipelineDescriptor, CompareFunction, CullMode, DepthStencilStateDescriptor, FrontFace, PipelineDescriptor,
RasterizationStateDescriptor, StencilStateFaceDescriptor, StencilStateDescriptor, RasterizationStateDescriptor, StencilStateDescriptor, StencilStateFaceDescriptor,
}, },
shader::{Shader, ShaderStage, ShaderStages}, shader::{Shader, ShaderStage, ShaderStages},
texture::TextureFormat, texture::TextureFormat,

2
crates/bevy_render/src/pipeline/pipeline.rs
View file

@ -4,7 +4,7 @@ use super::{
CompareFunction, CullMode, DepthStencilStateDescriptor, FrontFace, IndexFormat, CompareFunction, CullMode, DepthStencilStateDescriptor, FrontFace, IndexFormat,
PrimitiveTopology, RasterizationStateDescriptor, StencilStateFaceDescriptor, PrimitiveTopology, RasterizationStateDescriptor, StencilStateFaceDescriptor,
}, },
BindType, DynamicBinding, PipelineLayout, VertexBufferDescriptors, StencilStateDescriptor, BindType, DynamicBinding, PipelineLayout, StencilStateDescriptor, VertexBufferDescriptors,
}; };
use crate::{ use crate::{
shader::{Shader, ShaderStages}, shader::{Shader, ShaderStages},

6
crates/bevy_render/src/renderer/render_resource/bind_group.rs
View file

@ -46,8 +46,10 @@ impl BindGroupBuilder {
} }
binding.hash(&mut self.hasher); binding.hash(&mut self.hasher);
self.indexed_bindings self.indexed_bindings.push(IndexedBindGroupEntry {
.push(IndexedBindGroupEntry { index, entry: binding }); index,
entry: binding,
});
self self
} }

2
crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs
View file

@ -16,7 +16,7 @@ use bevy_render::{
texture::{Extent3d, SamplerDescriptor, TextureDescriptor}, texture::{Extent3d, SamplerDescriptor, TextureDescriptor},
}; };
use bevy_window::{Window, WindowId}; use bevy_window::{Window, WindowId};
use std::{ops::Range, sync::Arc, borrow::Cow}; use std::{borrow::Cow, ops::Range, sync::Arc};
use wgpu::util::DeviceExt; use wgpu::util::DeviceExt;
#[derive(Clone)] #[derive(Clone)]

5
crates/bevy_wgpu/src/wgpu_type_converter.rs
View file

@ -5,8 +5,8 @@ use bevy_render::{
BindType, BlendDescriptor, BlendFactor, BlendOperation, ColorStateDescriptor, ColorWrite, BindType, BlendDescriptor, BlendFactor, BlendOperation, ColorStateDescriptor, ColorWrite,
CompareFunction, CullMode, DepthStencilStateDescriptor, FrontFace, IndexFormat, CompareFunction, CullMode, DepthStencilStateDescriptor, FrontFace, IndexFormat,
InputStepMode, PrimitiveTopology, RasterizationStateDescriptor, StencilOperation, InputStepMode, PrimitiveTopology, RasterizationStateDescriptor, StencilOperation,
StencilStateFaceDescriptor, VertexAttributeDescriptor, VertexBufferDescriptor, StencilStateDescriptor, StencilStateFaceDescriptor, VertexAttributeDescriptor,
VertexFormat, StencilStateDescriptor, VertexBufferDescriptor, VertexFormat,
}, },
renderer::BufferUsage, renderer::BufferUsage,
texture::{ texture::{
@ -535,7 +535,6 @@ impl WgpuFrom<SamplerDescriptor> for wgpu::SamplerDescriptor<'_> {
lod_max_clamp: sampler_descriptor.lod_max_clamp, lod_max_clamp: sampler_descriptor.lod_max_clamp,
compare: sampler_descriptor.compare_function.map(|c| c.wgpu_into()), compare: sampler_descriptor.compare_function.map(|c| c.wgpu_into()),
anisotropy_clamp: sampler_descriptor.anisotropy_clamp, anisotropy_clamp: sampler_descriptor.anisotropy_clamp,
..Default::default()
} }
} }
} }