Skip to content

Commit

Permalink
androidabi on armv7
Browse files Browse the repository at this point in the history 
Co-Authored-By: MinerSebas <[email protected]>
  • Loading branch information
@mockersf @MinerSebas
mockersf and MinerSebas committed Apr 16, 2021
1 parent 376e2e1 commit a46c35a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions crates/bevy_render/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ parking_lot = "0.11.0"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
spirv-reflect = "0.2.3"

[target.'cfg(any(all(target_arch="x86_64", target_os="linux", target_env="gnu"), all(target_arch="x86_64", target_os="macos"), all(target_arch="aarch64", target_os="android"), all(target_arch="armv7", target_os="android"), all(target_arch="x86_64", target_os="windows", target_env="msvc"), all(target_arch="x86", target_os="windows", target_env="msvc"), all(target_arch="x86_64", target_os="windows", target_env="gnu"), all(target_arch="x86", target_os="windows", target_env="gnu")))'.dependencies]
[target.'cfg(any(all(target_arch="x86_64", target_os="linux", target_env="gnu"), all(target_arch="x86_64", target_os="macos"), all(target_arch="aarch64", target_os="android"), all(target_arch="armv7", target_os="androidabi"), all(target_arch="x86_64", target_os="windows", target_env="msvc"), all(target_arch="x86", target_os="windows", target_env="msvc"), all(target_arch="x86_64", target_os="windows", target_env="gnu"), all(target_arch="x86", target_os="windows", target_env="gnu")))'.dependencies]
bevy-glsl-to-spirv = "0.2.0"

[target.'cfg(not(any(target_arch = "wasm32", all(target_arch="x86_64", target_os="linux", target_env="gnu"), all(target_arch="x86_64", target_os="macos"), all(target_arch="aarch64", target_os="android"), all(target_arch="armv7", target_os="android"), all(target_arch="x86_64", target_os="windows", target_env="msvc"), all(target_arch="x86", target_os="windows", target_env="msvc"), all(target_arch="x86_64", target_os="windows", target_env="gnu"), all(target_arch="x86", target_os="windows", target_env="gnu"))))'.dependencies]
[target.'cfg(not(any(target_arch = "wasm32", all(target_arch="x86_64", target_os="linux", target_env="gnu"), all(target_arch="x86_64", target_os="macos"), all(target_arch="aarch64", target_os="android"), all(target_arch="armv7", target_os="androidabi"), all(target_arch="x86_64", target_os="windows", target_env="msvc"), all(target_arch="x86", target_os="windows", target_env="msvc"), all(target_arch="x86_64", target_os="windows", target_env="gnu"), all(target_arch="x86", target_os="windows", target_env="gnu"))))'.dependencies]
shaderc = "0.7.0"

[features]
Expand Down
14 changes: 7 additions & 7 deletions crates/bevy_render/src/shader/shader.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub enum ShaderError {
all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
all(target_arch = "x86_64", target_os = "macos"),
all(target_arch = "aarch64", target_os = "android"),
all(target_arch = "armv7", target_os = "android"),
all(target_arch = "armv7", target_os = "androidabi"),
all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"),
)))]
/// shaderc error.
Expand All @@ -44,7 +44,7 @@ pub enum ShaderError {
all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
all(target_arch = "x86_64", target_os = "macos"),
all(target_arch = "aarch64", target_os = "android"),
all(target_arch = "armv7", target_os = "android"),
all(target_arch = "armv7", target_os = "androidabi"),
all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"),
)))]
#[error("Error initializing shaderc Compiler")]
Expand All @@ -55,7 +55,7 @@ pub enum ShaderError {
all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
all(target_arch = "x86_64", target_os = "macos"),
all(target_arch = "aarch64", target_os = "android"),
all(target_arch = "armv7", target_os = "android"),
all(target_arch = "armv7", target_os = "androidabi"),
all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"),
)))]
#[error("Error initializing shaderc CompileOptions")]
Expand All @@ -66,7 +66,7 @@ pub enum ShaderError {
all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
all(target_arch = "x86_64", target_os = "macos"),
all(target_arch = "aarch64", target_os = "android"),
all(target_arch = "armv7", target_os = "android"),
all(target_arch = "armv7", target_os = "androidabi"),
all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"),
))]
impl From<ShaderStage> for bevy_glsl_to_spirv::ShaderType {
Expand All @@ -83,7 +83,7 @@ impl From<ShaderStage> for bevy_glsl_to_spirv::ShaderType {
all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
all(target_arch = "x86_64", target_os = "macos"),
all(target_arch = "aarch64", target_os = "android"),
all(target_arch = "armv7", target_os = "android"),
all(target_arch = "armv7", target_os = "androidabi"),
all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"),
))]
pub fn glsl_to_spirv(
Expand All @@ -100,7 +100,7 @@ pub fn glsl_to_spirv(
all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
all(target_arch = "x86_64", target_os = "macos"),
all(target_arch = "aarch64", target_os = "android"),
all(target_arch = "armv7", target_os = "android"),
all(target_arch = "armv7", target_os = "androidabi"),
all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"),
)))]
impl Into<shaderc::ShaderKind> for ShaderStage {
Expand All @@ -118,7 +118,7 @@ impl Into<shaderc::ShaderKind> for ShaderStage {
all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
all(target_arch = "x86_64", target_os = "macos"),
all(target_arch = "aarch64", target_os = "android"),
all(target_arch = "armv7", target_os = "android"),
all(target_arch = "armv7", target_os = "androidabi"),
all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"),
)))]
pub fn glsl_to_spirv(
Expand Down

0 comments on commit a46c35a

Please sign in to comment.