Commit Graph

61 Commits

Author SHA1 Message Date
Daniel McNab
7974817539
Upgrade wgpu (#676)
* Use the workaround from

https://github.com/gfx-rs/wgpu/issues/1374#issuecomment-839359307

* Upgrade to wgpu 0.9

We can't remove MPL from the deny.toml yes, as wgpu-subscriber
is still MPL

* swap to env-logger and log in all example paths

This also does let us remove MPL-2.0

As of https://github.com/EmbarkStudios/rust-gpu/pull/674, the crate of the
advisory is no longer in our tree

* Add a workaround for our *erm* strange codegen
2021-06-23 12:28:20 +02:00
Ashley Hauck
06f0aa2c3a
Release v0.4.0-alpha.10 (#679) 2021-06-23 09:32:09 +02:00
Ashley Hauck
1cef56bcf3
Cargo update (#674) 2021-06-17 17:06:26 +02:00
Ashley Hauck
db5e5fd336
rustup update and embark standard lints v0.4 (#672)
* rustup update

* update to embark standard lints v0.4
2021-06-17 13:10:19 +02:00
Daniel McNab
e66e72b049
Fix the output filename collision warning (#669)
This works simply by naming the binary crate
anything other than the name of the lib, which is example-runner-wgpu
As far as I know, the warning started in
https://github.com/EmbarkStudios/rust-gpu/pull/215

Since there is only one binary crate in the package, the command
(`cargo run -p example-runner-wgpu --release`)
maintains the same behaviour

The cargo issue is https://github.com/rust-lang/cargo/issues/6313

This warning caused problems for me in testing
https://github.com/Lokathor/bytemuck/pull/67
since I didn't notice the warning that my patch was not applied
2021-06-14 09:22:29 +02:00
Daniel McNab
364590e05f
Use bytemuck for the push constants (#668)
* Use bytemuck for the push constants

* Use the released version of bytemuck

https://github.com/Lokathor/bytemuck/pull/69 landed

That version also works 🎉
2021-06-14 09:20:55 +02:00
Daniel McNab
4b2011476b
Clean up the interface of the watching support (#663)
* Clean up the interface of the watching support

This allows us to avoid the seperate thread just for looping through
the graphics rx to the eventloop, for example
In almost all cases, intial results are blocked on the first result, and
then needs notifications for later changes

* Fix test failures

* fmt

* Remove the comment again
2021-06-14 09:19:41 +02:00
Daniel McNab
3bbe963998
👀 hot shader reloading (#655)
* Update builder to use a shared validation method

* Add the error for using print_metadata and watching

We cannot use print_metadata with watching
because print_metadata only makes sense
in build scripts, but watching does not
and would instead stall the script

* Add the initial implementation of watching

* Make hot reloading work in the wgpu example

* Attempt to address CI failures

* Add exception for notify CC0-1.0 license

* Address review comments

Co-authored-by: khyperia <github@khyperia.com>
2021-06-09 10:30:44 +02:00
Markus Siglreithmaier
486a3cee2e
Always emit cargo dependency information (#618)
* spirv-builder: Add more control over cargo metadata printout

* lint fix
2021-06-03 22:03:03 +02:00
Ashley Hauck
31bfc338e0
Release v0.4.0-alpha.9 (#646) 2021-06-03 12:35:53 +00:00
Daniel McNab
cb952562dd
Collatz Computation (#623)
Build the compute shader for vulkan1.1 as required
2021-06-03 14:20:42 +02:00
Ashley Hauck
92b680fdb9
Release v0.4.0-alpha.8 (#645) 2021-06-02 14:06:56 +02:00
Ashley Hauck
ba689b5603
Don't require Int* capabilities for mouse-shader (#636)
* Don't require Int* capabilities for mouse-shader

* Make Int*/Float64 errors be zombie_even_in_user_code

* Demote glam back to a non-system crate
2021-05-31 11:56:15 +02:00
Alex Es
62f375f148
Fix simplest and sky shaders being switched in example-runner-wgpu's rebuild code. (#639) 2021-05-31 09:50:50 +00:00
Ashley Hauck
fcf6ee76c8
Reduce CI times (#637)
* Reduce CI times

* Reduce RUSTUP_UNPACK_RAM

* Set RUSTUP_IO_THREADS=1

* Include https://github.com/EmbarkStudios/ash-molten/pull/57 This fixes github API rate limit errors

* Inline test.sh to show timings for each step and generally have a less-jank UI
2021-05-31 11:17:34 +02:00
Ashley Hauck
6019f391ec
Add API to enable ext/capabilities, and remove default capabilities (#630)
* Do not set some capabilities by default

* Fix nondeterminism

* Add required caps to mouse shader
2021-05-26 11:57:16 +02:00
Ashley Hauck
47d1e75327
Always emit json metadata, and emit entry point names (#622)
* Always emit json metadata

* Codegen shader entry point names

* Fix tests
2021-05-24 09:45:58 +02:00
Ashley Hauck
6bff395680
Build the wgpu shader at runtime (#627)
* Build the wgpu shader at runtime
2021-05-21 12:09:56 +00:00
XAMPPRocky
a14e3ec110
Release 0.4.0-alpha.6 (#606)
compiletests@0.4.0-alpha.6
compiletests-deps-helper@0.4.0-alpha.6
compute-shader@0.4.0-alpha.6
example-runner-ash@0.4.0-alpha.6
example-runner-cpu@0.4.0-alpha.6
example-runner-wgpu@0.4.0-alpha.6
mouse-shader@0.4.0-alpha.6
multibuilder@0.4.0-alpha.6
rustc_codegen_spirv@0.4.0-alpha.6
shared@0.4.0-alpha.6
simplest-shader@0.4.0-alpha.6
sky-shader@0.4.0-alpha.6
spirv-builder@0.4.0-alpha.6
spirv-std@0.4.0-alpha.6
spirv-std-macros@0.4.0-alpha.6
spirv-types@0.4.0-alpha.6

Generated by cargo-workspaces
2021-04-29 09:24:21 +02:00
XAMPPRocky
b6311789bb
Add new handling for SPIR-V targets (#559)
* Add new handling for SPIR-V targets

* Ensure target is always three components
2021-04-12 11:19:28 +00:00
XAMPPRocky
4824d205ba
Release 0.4.0-alpha.5 (#590)
compiletests@0.4.0-alpha.5
compiletests-deps-helper@0.4.0-alpha.5
compute-shader@0.4.0-alpha.5
example-runner-ash@0.4.0-alpha.5
example-runner-cpu@0.4.0-alpha.5
example-runner-wgpu@0.4.0-alpha.5
mouse-shader@0.4.0-alpha.5
multibuilder@0.4.0-alpha.5
rustc_codegen_spirv@0.4.0-alpha.5
shared@0.4.0-alpha.5
simplest-shader@0.4.0-alpha.5
sky-shader@0.4.0-alpha.5
spirv-builder@0.4.0-alpha.5
spirv-std@0.4.0-alpha.5
spirv-std-macros@0.4.0-alpha.5

Generated by cargo-workspaces
2021-04-12 10:27:55 +02:00
XAMPPRocky
98d7dec503
Release 0.4.0-alpha.4 (#582)
compiletests@0.4.0-alpha.4
compiletests-deps-helper@0.4.0-alpha.4
compute-shader@0.4.0-alpha.4
example-runner-ash@0.4.0-alpha.4
example-runner-cpu@0.4.0-alpha.4
example-runner-wgpu@0.4.0-alpha.4
mouse-shader@0.4.0-alpha.4
multibuilder@0.4.0-alpha.4
rustc_codegen_spirv@0.4.0-alpha.4
shared@0.4.0-alpha.4
simplest-shader@0.4.0-alpha.4
sky-shader@0.4.0-alpha.4
spirv-builder@0.4.0-alpha.4
spirv-std@0.4.0-alpha.4
spirv-std-macros@0.4.0-alpha.4

Generated by cargo-workspaces
2021-04-08 13:58:43 +03:00
XAMPPRocky
f09a5f6e65
Release 0.4.0-alpha.3 (#560)
compiletests@0.4.0-alpha.3
compiletests-deps-helper@0.4.0-alpha.3
compute-shader@0.4.0-alpha.3
example-runner-ash@0.4.0-alpha.3
example-runner-cpu@0.4.0-alpha.3
example-runner-wgpu@0.4.0-alpha.3
mouse-shader@0.4.0-alpha.3
multibuilder@0.4.0-alpha.3
rustc_codegen_spirv@0.4.0-alpha.3
shared@0.4.0-alpha.3
simplest-shader@0.4.0-alpha.3
sky-shader@0.4.0-alpha.3
spirv-builder@0.4.0-alpha.3
spirv-std@0.4.0-alpha.3
spirv-std-macros@0.4.0-alpha.3

Generated by cargo-workspaces
2021-03-30 11:23:16 +00:00
Ashley
7c0c467e96
Follow best practice hints and reset command pool instead of the single buffer (#528) 2021-03-23 06:37:52 +01:00
Ashley
872e06257f
Clean up recreate_swapchain and some other things in the ash runner (#514)
* Remove an unused command buffer and fence in the ash runner

* Don't recreate command buffer when recreating the swapchain

* Don't recreate the render pass
2021-03-22 14:05:45 +01:00
XAMPPRocky
52ae430ec1
Update dependencies (#506) 2021-03-22 09:27:34 +01:00
Ashley Hauck
4bd0dcaf3f
Update wgpu 0.6->0.7 (#509)
* Update wgpu 0.6->0.7

* Allow zlib license in dependencies
2021-03-19 13:59:29 +00:00
Erin Power
144a447f30 Add prefer-dynamic to cargo config 2021-03-17 12:33:50 +01:00
Erin Power
c18f9e170e Disable testing on the example CPU runner 2021-03-17 11:53:50 +01:00
Eduard-Mihai Burtescu
a0b4de4cf6 Bump rust-toolchain to nightly-2021-03-17, unlocking for i in 0..n loops! 2021-03-17 03:31:11 +02:00
XAMPPRocky
6e8453f386
Decouple glam from spirv-std (#476) 2021-03-16 09:59:08 +01:00
Johan Andersson
a990ed5696
Use Embark standard lints v0.2 (#475) 2021-03-08 10:37:43 +01:00
XAMPPRocky
5cfaa0055b
Update to the latest nightly (#467)
* Update to the latest nightly

* Update to fix clippy lints

* ignore test for now
2021-03-04 14:12:00 +01:00
AidanConnelly
df89d273f2
Remove unused dead code in example-runner-ash/main.rs (#449) 2021-02-26 12:58:52 +01:00
Henno
45f7a36d66
Fix wgpu-runner validation errors on minimize (#424)
Vulkan swap chains must have non-zero dimensions, this adds a check for that during swap chain resizing and does not create one if it would be invalid.
2021-02-15 15:48:29 +01:00
Ashley Hauck
f9c2bdc766
Update minifb to released version (#395) 2021-01-26 11:17:43 +00:00
Ashley Hauck
1454fe38a3
Update Cargo.lock (#381) 2021-01-18 14:35:12 +00:00
XAMPPRocky
38f2ec12c9
Update bimap->0.6, pipe->0.4, strum->0.20, websys->0.3.46 (#365) 2021-01-11 09:08:02 +00:00
Frank Murphy
8acde75c13
Add dummy binding for compute shader example (#328)
* Add dummy binding for compute shader example

* Linter fixes
2021-01-04 16:00:34 +00:00
Johan Andersson
d883b6cbb3
Upgrade winit v0.23 -> v0.24 (#353)
Fixes building for aarch64-apple-darwin
2020-12-20 00:22:17 +01:00
Henno
bc4c07e54f
Ash runner: fix crash on resize/minimize and add shader hot reloading (#299)
* window resizing and hot reloading

* remove windows paths and fix viewport creation

* readd spirv tools features

* re-remove features

* and add them again

* CI fix

* proper-resizing-and-validation-fixes

* linux validation fix

* fix zero height halting rendering

rendering wasn't getting unpaused after being set to zero height and then made larger again

* fix wgpu crash on laptops with both dedi and integrated GPUs

This fix still requires the user to set their default GPU to their dedicated one.

* METAL or VULKAN backend bit

* rebuild pipelines after updating shaders

* use spirv-builder, resolve merge conflict

* fmt
2020-12-16 17:41:48 +00:00
Eduard-Mihai Burtescu
aed5204f4a
Mouse support for the wgpu runner, and a shader to demonstrate it. (#341) 2020-12-15 11:33:24 +00:00
Ashley Hauck
0801e48ae0
Update glam to include latest changes (#291)
* Update glam to include latest changes

* Try workaround on CI...
2020-12-01 12:47:37 +00:00
Gray Olson
353fa96af6
Rename pow to powf, remove saturate from MathExt, and update to latest glam (#248)
* remove saturate from spirv_std MathExt and rename pow to powf

* update to latest glam

* update glam again and add `std` feature to `spirv-std` to support cpu runner

* re-remove spirv-tools-sys submodule

* fixup! Merge branch 'main' into powf-saturate

* Use libm instead of MathExt

* Fix lint for unused import when compiling with std

Co-authored-by: khyperia <github@khyperia.com>
2020-11-24 09:28:58 +00:00
Viktor Zoutman
2dd8dba3b0
Moved some functions to a shared crate (#255)
* Moved some functions to a shared crate

* fmt!

* fixed the cpu
2020-11-18 14:27:32 +00:00
XAMPPRocky
c1c72517c8
Update ash-molten to compile on macOS (#252) 2020-11-18 10:33:10 +00:00
Viktor Zoutman
ec89ddf446
Sky shader Improvements. (#245)
* Added some constants to the shader

* did something for a certain video i forgot to revert

* removed unused function

* cleanup

* cpu runner now works

* explicit naming

* removed paranthesis

* clippy

* CLIPPY
2020-11-16 15:17:09 +00:00
Viktor Zoutman
2d75e0473f
Merged wgpu runners (#241)
* Added clap to switch between shaders

* Merged wgpu runners

* tested something related to async which i forgot to udno

* clippy

* xamprocky suggestion
2020-11-16 11:21:33 +00:00
Viktor Zoutman
0f78bd3e6b
Added clap to switch between shaders (#240) 2020-11-13 18:37:30 +00:00
XAMPPRocky
45f2312947
Put shader modules at the top of the example runners (#229) 2020-11-13 11:19:23 +00:00