From c40f39ec7e16bea0a05390f258f524ba36e76cc6 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 13 Aug 2020 12:50:13 -0400 Subject: [PATCH] Make sure we translate the new type for wgpu. --- .../src/renderer/wgpu_render_resource_context.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 f5970f17ce..fbe3cafe1f 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::{Assets, Handle, HandleUntyped}; use bevy_render::{ - pipeline::{BindGroupDescriptor, BindGroupDescriptorId, PipelineDescriptor}, + pipeline::{BindGroupDescriptor, BindGroupDescriptorId, BindingShaderStage, PipelineDescriptor}, renderer::{ BindGroup, BufferId, BufferInfo, RenderResourceBinding, RenderResourceContext, RenderResourceId, SamplerId, TextureId, @@ -115,7 +115,13 @@ impl WgpuRenderResourceContext { .map(|binding| { wgpu::BindGroupLayoutEntry::new( binding.index, - wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT, + match binding.shader_stage { + BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT => wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT, + BindingShaderStage::VERTEX => wgpu::ShaderStage::VERTEX, + BindingShaderStage::FRAGMENT => wgpu::ShaderStage::FRAGMENT, + BindingShaderStage::COMPUTE => wgpu::ShaderStage::COMPUTE, + _ => panic!("Invalid binding shader stage."), + }, (&binding.bind_type).wgpu_into(), ) })