forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CI for android (#2971)

Browse Source 
# Objective

The update to wgpu 0.11 broke CI for android. This was due to a confusion between `bevy::render::ShaderStage` and `wgpu::ShaderStage`.


## Solution

Revert the incorrect change
This commit is contained in:
davier 2021-10-15 23:08:15 +00:00
parent 43e8a156fb
commit b13357e7b2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/bevy_render/src/shader/shader.rs
View File

@ -106,9 +106,9 @@ pub fn glsl_to_spirv(
impl Into<shaderc::ShaderKind> for ShaderStage { impl Into<shaderc::ShaderKind> for ShaderStage {
fn into(self) -> shaderc::ShaderKind { fn into(self) -> shaderc::ShaderKind {
match self { match self {
ShaderStages::VERTEX => shaderc::ShaderKind::Vertex, ShaderStage::Vertex => shaderc::ShaderKind::Vertex,
ShaderStages::FRAGMENT => shaderc::ShaderKind::Fragment, ShaderStage::Fragment => shaderc::ShaderKind::Fragment,
ShaderStages::COMPUTE => shaderc::ShaderKind::Compute, ShaderStage::Compute => shaderc::ShaderKind::Compute,
} }
} }
} }