From 0dd55f2c4036e9559a6d1dad009eb6c4678bdb88 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Mon, 11 May 2020 14:08:20 -0700 Subject: [PATCH] cleanup --- crates/bevy_pathfinder/src/device.rs | 16 ++++++++-------- .../src/renderer/wgpu_render_resource_context.rs | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/crates/bevy_pathfinder/src/device.rs b/crates/bevy_pathfinder/src/device.rs index 92f002b075..9758c33f1e 100644 --- a/crates/bevy_pathfinder/src/device.rs +++ b/crates/bevy_pathfinder/src/device.rs @@ -1078,17 +1078,17 @@ struct UniformBuffer { ranges: Vec>, } -pub const pathfinder_vertex_buffer_0: &'static str = "P0"; -pub const pathfinder_vertex_buffer_1: &'static str = "P1"; -pub const pathfinder_vertex_buffer_2: &'static str = "P2"; -pub const pathfinder_vertex_buffer_3: &'static str = "P3"; +pub const PATHFINDER_VERTEX_BUFFER_0: &'static str = "P0"; +pub const PATHFINDER_VERTEX_BUFFER_1: &'static str = "P1"; +pub const PATHFINDER_VERTEX_BUFFER_2: &'static str = "P2"; +pub const PATHFINDER_VERTEX_BUFFER_3: &'static str = "P3"; pub fn get_vertex_buffer_name(index: usize) -> &'static str { match index { - 0 => pathfinder_vertex_buffer_0, - 1 => pathfinder_vertex_buffer_1, - 2 => pathfinder_vertex_buffer_2, - 3 => pathfinder_vertex_buffer_3, + 0 => PATHFINDER_VERTEX_BUFFER_0, + 1 => PATHFINDER_VERTEX_BUFFER_1, + 2 => PATHFINDER_VERTEX_BUFFER_2, + 3 => PATHFINDER_VERTEX_BUFFER_3, _ => panic!("encountered unknown vertex buffer index"), } } \ No newline at end of file diff --git a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs index b20687336b..231f9abd5b 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs @@ -5,7 +5,7 @@ use crate::{ use bevy_asset::{AssetStorage, Handle, HandleUntyped}; use bevy_render::{ - pipeline::{BindGroupDescriptor, BindType, PipelineDescriptor}, + pipeline::{BindGroupDescriptor, PipelineDescriptor}, render_resource::{ BufferInfo, RenderResource, RenderResourceAssignment, RenderResourceAssignments, RenderResourceSetId, ResourceInfo, @@ -525,7 +525,6 @@ impl RenderResourceContext for WgpuRenderResourceContext { range: range.clone(), } } - _ => panic!("unsupported bind type"), }; wgpu::Binding { binding: binding.index,