Skip to content

Commit

Permalink
skip testing for now
Browse files Browse the repository at this point in the history
  • Loading branch information
schell committed Nov 28, 2023
1 parent c3fad46 commit 40c8775
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ jobs:
with:
toolchain: stable
- run: |
# ensure the shader binaries were properly checked in
rm -rf crates/renderling/src/linkage/*.spv
cd shaders && cargo run --release && cd ..
# ensure the shader binaries were properly checked in
git diff --exit-code --no-ext-diff crates/renderling/src/linkage
# ensure the shaders are valid for our uses (see renderling::linkage::validate_shaders)
cargo test -p renderling -- --nocapture linkage
#renderling-test:
# runs-on: [ubuntu-latest, gpu]
Expand Down
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ resolver = "2"

[workspace.dependencies]
bytemuck = { version = "1.13.0", features = ["derive"] }
futures-lite = "^1.13"
futures-lite = "1.13"
gltf = { git = 'https://github.com/gltf-rs/gltf.git', features = ["KHR_lights_punctual", "KHR_materials_unlit", "KHR_materials_emissive_strength", "extras"] }
image = "^0.24"
log = "^0.4"
glam = "^0.24"
winit = { version = "^0.27" }
wgpu = { version = "^0.17" }
image = "0.24"
log = "0.4"
glam = "0.24.2"
winit = { version = "0.27" }
wgpu = { version = "0.17" }
4 changes: 2 additions & 2 deletions crates/renderling-shader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ default = []
[dependencies]
bytemuck = { workspace = true }
renderling-derive = { version = "0.1.0", path = "../renderling-derive" }
spirv-std = "^0.9"
spirv-std = "0.9"

[target.'cfg(not(target_arch = "spirv"))'.dependencies]
glam = { workspace = true, features = ["bytemuck"] }
Expand All @@ -21,7 +21,7 @@ glam = { workspace = true, features = ["bytemuck"] }
glam = { workspace = true, features = ["debug-glam-assert", "bytemuck"] }

[target.'cfg(target_arch = "spirv")'.dependencies]
glam = { version = "^0.24", default-features = false, features = ["libm", "bytemuck"] }
glam = { version = "0.24.2", default-features = false, features = ["libm", "bytemuck"] }

[dev-dependencies]
image = { workspace = true }
Expand Down
12 changes: 4 additions & 8 deletions crates/renderling-shader/src/slab.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ impl<T: Slabbed, const N: usize> Slabbed for [T; N] {

impl Slabbed for glam::Mat4 {
fn read_slab(&mut self, index: usize, slab: &[u32]) -> usize {
if slab.len() < index + 16 {
return index;
}
let Self {
x_axis,
y_axis,
Expand Down Expand Up @@ -218,11 +215,10 @@ impl Slabbed for glam::Vec4 {
if slab.len() < index + 4 {
return index;
}
let Self { x, y, z, w } = self;
let index = x.read_slab(index, slab);
let index = y.read_slab(index, slab);
let index = z.read_slab(index, slab);
w.read_slab(index, slab)
let index = self.x.read_slab(index, slab);
let index = self.y.read_slab(index, slab);
let index = self.z.read_slab(index, slab);
self.w.read_slab(index, slab)
}

fn write_slab(&self, index: usize, slab: &mut [u32]) -> usize {
Expand Down
2 changes: 1 addition & 1 deletion shaders/shader-crate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ crate-type = ["dylib"]
[dependencies]
renderling-shader = { path = "../../crates/renderling-shader" }
spirv-std = "^0.9"
glam = { version = "0.24.1", default-features = false, features = ["libm"]}
glam = { version = "0.24.2", default-features = false, features = ["libm"]}

0 comments on commit 40c8775

Please sign in to comment.