Skip to content
This repository was archived by the owner on Jun 18, 2021. It is now read-only.

Add include_spirv macro#384

Merged
bors[bot] merged 1 commit intogfx-rs:masterfrom
kvark:wgsl
Jun 18, 2020
Merged

Add include_spirv macro#384
bors[bot] merged 1 commit intogfx-rs:masterfrom
kvark:wgsl

Conversation

@kvark
Copy link
Copy Markdown
Member

@kvark kvark commented Jun 17, 2020

Depends on gfx-rs/wgpu#729
Makes out shader loading in the examples a bit tidier.

bors bot added a commit to gfx-rs/wgpu that referenced this pull request Jun 18, 2020
729: Basic support for WGSL r=cwfitzgerald a=kvark

Connections:
- gfx-rs/wgpu-rs#384

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
Copy link
Copy Markdown
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some commentary/nits, but by and large looks good and a good framework for when naga supports more than wgsl.

@kvark kvark marked this pull request as ready for review June 18, 2020 02:38
@kvark
Copy link
Copy Markdown
Member Author

kvark commented Jun 18, 2020

Thank you both for reviewing! This is updated now, PTAL

@kvark kvark requested a review from cwfitzgerald June 18, 2020 02:39
@kvark
Copy link
Copy Markdown
Member Author

kvark commented Jun 18, 2020

Thank you! Last notes are now addressed.
bors r=cwfitzgerald,rukai

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jun 18, 2020

@bors bors bot merged commit 69797d5 into gfx-rs:master Jun 18, 2020
@kvark kvark deleted the wgsl branch June 18, 2020 13:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants