nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2025-02-16 17:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed spirv-attrib to spirv-std-macros (#347)

Browse Source
This commit is contained in:
Viktor Zoutman 2020-12-15 16:16:57 +01:00 committed by GitHub
parent 46c16d1d0b
commit a2a2e3917e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@ -308,8 +308,8 @@ dependencies = [
name = "compute-shader"
version = "0.1.0"
dependencies = [
"spirv-attrib",
"spirv-std",
"spirv-std-macros",
]
[[package]]
@ -2134,16 +2134,16 @@ dependencies = [
name = "shared"
version = "0.1.0"
dependencies = [
"spirv-attrib",
"spirv-std",
"spirv-std-macros",
]
[[package]]
name = "simplest-shader"
version = "0.1.0"
dependencies = [
"spirv-attrib",
"spirv-std",
"spirv-std-macros",
]
[[package]]
@ -2151,8 +2151,8 @@ name = "sky-shader"
version = "0.1.0"
dependencies = [
"shared",
"spirv-attrib",
"spirv-std",
"spirv-std-macros",
]
[[package]]
@ -2187,10 +2187,6 @@ dependencies = [
"wayland-protocols 0.28.2",
]
[[package]]
name = "spirv-attrib"
version = "0.1.0"
[[package]]
name = "spirv-builder"
version = "0.2.0"
@ -2210,9 +2206,13 @@ version = "0.2.0"
dependencies = [
"glam",
"num-traits",
"spirv-attrib",
"spirv-std-macros",
]
[[package]]
name = "spirv-std-macros"
version = "0.1.0"
[[package]]
name = "spirv-tools"
version = "0.2.0"

2
crates/spirv-attrib/Cargo.toml → crates/spirv-std-macros/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "spirv-attrib"
name = "spirv-std-macros"
version = "0.1.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"

0
crates/spirv-attrib/src/lib.rs → crates/spirv-std-macros/src/lib.rs
View File

2
crates/spirv-std/Cargo.toml
View File

@ -9,7 +9,7 @@ repository = "https://github.com/EmbarkStudios/rust-gpu"
[dependencies]
glam = { version = "0.11.1", default-features = false, features = ["libm"] }
num-traits = { version = "0.2.14", default-features = false }
spirv-attrib = { path = "../spirv-attrib" }
spirv-std-macros = { path = "../spirv-std-macros" }
[features]
default = []

2
crates/spirv-std/src/lib.rs
View File

@ -41,7 +41,7 @@
#[cfg(not(target_arch = "spirv"))]
#[macro_use]
pub extern crate spirv_attrib;
pub extern crate spirv_std_macros;
pub mod storage_class;
mod textures;

2
examples/shaders/compute-shader/Cargo.toml
View File

@ -9,5 +9,5 @@ license = "MIT OR Apache-2.0"
crate-type = ["dylib"]
[dependencies]
spirv-attrib = { path = "../../../crates/spirv-attrib" }
spirv-std-macros = { path = "../../../crates/spirv-std-macros" }
spirv-std = { path = "../../../crates/spirv-std" }

2
examples/shaders/compute-shader/src/lib.rs
View File

@ -9,7 +9,7 @@ extern crate spirv_std;
#[cfg(not(target_arch = "spirv"))]
#[macro_use]
pub extern crate spirv_attrib;
pub extern crate spirv_std_macros;
#[allow(unused_attributes)]
#[spirv(gl_compute)]

2
examples/shaders/shared/Cargo.toml
View File

@ -7,5 +7,5 @@ license = "MIT OR Apache-2.0"
publish = false
[dependencies]
spirv-attrib = { path = "../../../crates/spirv-attrib" }
spirv-std-macros = { path = "../../../crates/spirv-std-macros" }
spirv-std = { path = "../../../crates/spirv-std" }

2
examples/shaders/shared/src/lib.rs
View File

@ -9,7 +9,7 @@
#[cfg(not(target_arch = "spirv"))]
#[macro_use]
pub extern crate spirv_attrib;
pub extern crate spirv_std_macros;
use core::f32::consts::PI;
use spirv_std::glam::{vec3, Vec3};

2
examples/shaders/simplest-shader/Cargo.toml
View File

@ -10,5 +10,5 @@ publish = false
crate-type = ["dylib"]
[dependencies]
spirv-attrib = { path = "../../../crates/spirv-attrib" }
spirv-std-macros = { path = "../../../crates/spirv-std-macros" }
spirv-std = { path = "../../../crates/spirv-std" }

2
examples/shaders/simplest-shader/src/lib.rs
View File

@ -7,7 +7,7 @@
#[cfg(not(target_arch = "spirv"))]
#[macro_use]
pub extern crate spirv_attrib;
pub extern crate spirv_std_macros;
use spirv_std::glam::{vec4, Vec4};
use spirv_std::storage_class::{Input, Output};

2
examples/shaders/sky-shader/Cargo.toml
View File

@ -11,5 +11,5 @@ crate-type = ["dylib"]
[dependencies]
shared = { path = "../../shaders/shared" }
spirv-attrib = { path = "../../../crates/spirv-attrib" }
spirv-std-macros = { path = "../../../crates/spirv-std-macros" }
spirv-std = { path = "../../../crates/spirv-std" }

2
examples/shaders/sky-shader/src/lib.rs
View File

@ -9,7 +9,7 @@
#[cfg(not(target_arch = "spirv"))]
#[macro_use]
pub extern crate spirv_attrib;
pub extern crate spirv_std_macros;
use core::f32::consts::PI;
use shared::*;