Skip to content

Commit b12a2f3

Browse files
authored
Cleanup pass on example shader and vk example-runner (#109)
* get rid of vertex buffers in example * get rid of unused attributes in example shader * use negative viewport height to match wgpu * remove depth buffer * use SRGB surface * improve tonemapping remove 'gamma correction' in favor of hardware srgb support * make clippy happy * move tonemapping out of sky(), rename gl_pos to builtin_pos * rename shaders and use sky shader in wgpu example runner * apply srgb OETF and invert clip space for cpu example runner * restructure example directory structure according to #170 * update winit in wgpu example runner * fix deny.toml example crate refs * fix ci example name on maOS * example-shader -> sky-shader in docs * update sky shader image * re-enable clippy and make it happy
1 parent 5a7aabe commit b12a2f3

File tree

21 files changed

+281
-826
lines changed

21 files changed

+281
-826
lines changed

.github/workflows/clippy.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ clippy spirv-builder
3535

3636
# Examples
3737

38-
# disabled due to https://github.com/EmbarkStudios/rust-gpu/issues/186
39-
#clippy examples/example-runner
38+
clippy examples/runners/ash
39+
clippy examples/runners/wgpu
4040

41-
clippy examples/wgpu-example-runner
42-
43-
clippy_no_features examples/example-runner-cpu
44-
clippy_no_features examples/example-shader
45-
clippy_no_features examples/wgpu-example-shader
41+
clippy_no_features examples/runners/cpu
42+
clippy_no_features examples/shaders/sky-shader
43+
clippy_no_features examples/shaders/simplest-shader

.github/workflows/test.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ cargo_test spirv-builder
4545
# Examples
4646
# See: https://github.com/EmbarkStudios/rust-gpu/issues/84
4747
if [[ -z "${CI}" && "$os" != "macOS" ]]; then
48-
cargo_test examples/example-runner
48+
cargo_test examples/runners/ash
4949
fi
5050

51-
cargo_test examples/wgpu-example-runner
51+
cargo_test examples/runners/wgpu
5252

53-
cargo_test_no_features examples/example-runner-cpu
54-
cargo_test_no_features examples/example-shader
55-
cargo_test_no_features examples/wgpu-example-shader
53+
cargo_test_no_features examples/runners/cpu
54+
cargo_test_no_features examples/shaders/sky-shader
55+
cargo_test_no_features examples/shaders/simplest-shader

0 commit comments

Comments
 (0)