This commit is contained in:
Carter Anderson 2020-05-11 14:08:20 -07:00
parent f98918fd5c
commit 0dd55f2c40
2 changed files with 9 additions and 10 deletions

View File

@ -1078,17 +1078,17 @@ struct UniformBuffer {
ranges: Vec<Range<usize>>, ranges: Vec<Range<usize>>,
} }
pub const pathfinder_vertex_buffer_0: &'static str = "P0"; pub const PATHFINDER_VERTEX_BUFFER_0: &'static str = "P0";
pub const pathfinder_vertex_buffer_1: &'static str = "P1"; pub const PATHFINDER_VERTEX_BUFFER_1: &'static str = "P1";
pub const pathfinder_vertex_buffer_2: &'static str = "P2"; pub const PATHFINDER_VERTEX_BUFFER_2: &'static str = "P2";
pub const pathfinder_vertex_buffer_3: &'static str = "P3"; pub const PATHFINDER_VERTEX_BUFFER_3: &'static str = "P3";
pub fn get_vertex_buffer_name(index: usize) -> &'static str { pub fn get_vertex_buffer_name(index: usize) -> &'static str {
match index { match index {
0 => pathfinder_vertex_buffer_0, 0 => PATHFINDER_VERTEX_BUFFER_0,
1 => pathfinder_vertex_buffer_1, 1 => PATHFINDER_VERTEX_BUFFER_1,
2 => pathfinder_vertex_buffer_2, 2 => PATHFINDER_VERTEX_BUFFER_2,
3 => pathfinder_vertex_buffer_3, 3 => PATHFINDER_VERTEX_BUFFER_3,
_ => panic!("encountered unknown vertex buffer index"), _ => panic!("encountered unknown vertex buffer index"),
} }
} }

View File

@ -5,7 +5,7 @@ use crate::{
use bevy_asset::{AssetStorage, Handle, HandleUntyped}; use bevy_asset::{AssetStorage, Handle, HandleUntyped};
use bevy_render::{ use bevy_render::{
pipeline::{BindGroupDescriptor, BindType, PipelineDescriptor}, pipeline::{BindGroupDescriptor, PipelineDescriptor},
render_resource::{ render_resource::{
BufferInfo, RenderResource, RenderResourceAssignment, RenderResourceAssignments, BufferInfo, RenderResource, RenderResourceAssignment, RenderResourceAssignments,
RenderResourceSetId, ResourceInfo, RenderResourceSetId, ResourceInfo,
@ -525,7 +525,6 @@ impl RenderResourceContext for WgpuRenderResourceContext {
range: range.clone(), range: range.clone(),
} }
} }
_ => panic!("unsupported bind type"),
}; };
wgpu::Binding { wgpu::Binding {
binding: binding.index, binding: binding.index,