From a46c35a7a050440fa3e672d46bad97c94ed8a0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Fri, 16 Apr 2021 22:19:29 +0200 Subject: [PATCH] androidabi on armv7 Co-Authored-By: MinerSebas <66798382+MinerSebas@users.noreply.github.com> --- crates/bevy_render/Cargo.toml | 4 ++-- crates/bevy_render/src/shader/shader.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 1b305418c8e4f..214d0a3d923e4 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -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] diff --git a/crates/bevy_render/src/shader/shader.rs b/crates/bevy_render/src/shader/shader.rs index 24d751959bfd9..6ce291f670064 100644 --- a/crates/bevy_render/src/shader/shader.rs +++ b/crates/bevy_render/src/shader/shader.rs @@ -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. @@ -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")] @@ -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")] @@ -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 for bevy_glsl_to_spirv::ShaderType { @@ -83,7 +83,7 @@ impl From 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( @@ -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 for ShaderStage { @@ -118,7 +118,7 @@ impl Into 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(