Skip to content

Commit f39a44c

Browse files
daniel-keiteldaniel-keitel
authored
Merge pull request #2 from Vecvec/ray-tracing
upgrade ray-tracing branch to main branch
2 parents c789f7f + 316f0e2 commit f39a44c

File tree

1,072 files changed

+167349
-22316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,072 files changed

+167349
-22316
lines changed

‎.cargo/config.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[alias]
2+
xtask = "run --manifest-path xtask/Cargo.toml"
3+
4+
[build]
5+
rustflags = [
6+
"--cfg=web_sys_unstable_apis"
7+
]

‎.config/nextest.toml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# None of our tests should take longer than 45s, and if they've gone 2x that,
2+
# terminate them to prevent infinite run-on.
3+
[profile.default]
4+
slow-timeout = { period = "45s", terminate-after = 2 }
5+
6+
# Use two threads for tests with "2_threads" in their name
7+
[[profile.default.overrides]]
8+
filter = 'test(~2_threads)'
9+
threads-required = 2

‎.deny.toml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
[bans]
22
multiple-versions = "deny"
33
skip-tree = [
4-
{ name = "cts_runner" },
5-
{ name = "player" },
6-
{ name = "wgpu-info" },
4+
{ name = "windows-sys", version = "0.45" },
5+
{ name = "winit", version = "0.27.5" },
6+
{ name = "rustc_version", version = "0.2.3" },
77
]
88
skip = [
9-
{ name = "wgpu" }
109
]
1110
wildcards = "deny"
1211

@@ -19,14 +18,19 @@ allow = [
1918
"CC0-1.0",
2019
"ISC",
2120
"MIT",
22-
"MPL-2.0",
21+
"MIT-0",
2322
"Unicode-DFS-2016",
2423
"Zlib",
2524
]
2625

2726
[sources]
2827
allow-git = [
28+
# Waiting on releases; used in examples only
29+
"https://github.com/SiegeEngine/ddsfile",
30+
"https://github.com/Razaekel/noise-rs",
31+
2932
"https://github.com/grovesNL/glow",
33+
"https://github.com/gfx-rs/metal-rs",
3034
]
3135
unknown-registry = "deny"
3236
unknown-git = "deny"

‎.github/CODEOWNERS‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
/cts_runner/ @crowlKats
2-
/deno_webgpu/ @crowlKats
1+
* @gfx-rs/wgpu
2+
3+
/cts_runner/ @gfx-rs/deno @gfx-rs/wgpu
4+
/deno_webgpu/ @gfx-rs/deno @gfx-rs/wgpu
5+
/naga/ @gfx-rs/naga
6+
/naga-cli/ @gfx-rs/naga
7+
8+
# We leave the codeowners empty for the changelog, so naga changes
9+
# don't trigger wgpu reviews and vise versa.
10+
/CHANGELOG.md

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Issues with shaders
4-
url: https://github.com/gfx-rs/naga/issues/new/choose
5-
about: Issues with or enhancements for the shader translation.
63
- name: Question about wgpu
74
url: https://github.com/gfx-rs/wgpu/discussions/new
85
about: Any questions about how to use wgpu should go here.

‎.github/dependabot.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,24 @@ updates:
44
- package-ecosystem: cargo
55
directory: /
66
schedule:
7-
interval: daily
7+
interval: weekly
8+
# This allows dependabot to update _all_ lockfile packages.
9+
#
10+
# These will be grouped into the existing group update PRs, so shoudn't generate additional jobs.
11+
allow:
12+
# Allow both direct and indirect updates for all packages
13+
- dependency-type: "all"
14+
# Waiting on https://github.com/dependabot/dependabot-core/issues/4009 to be resolved, shouldn't be long.
15+
# versioning-strategy: increase-if-necessary
16+
groups:
17+
patch-updates:
18+
patterns:
19+
- "*"
20+
update-types:
21+
- "minor"
22+
- "patch"
823

924
- package-ecosystem: github-actions
1025
directory: /
1126
schedule:
12-
interval: daily
27+
interval: weekly

‎.github/pull_request_template.md‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
**Checklist**
2-
3-
- [ ] Run `cargo clippy`.
4-
- [ ] Run `cargo clippy --target wasm32-unknown-unknown` if applicable.
5-
- [ ] Add change to CHANGELOG.md. See simple instructions inside file.
6-
71
**Connections**
82
_Link to the issues addressed by this PR, or dependent PRs in other repositories_
93

@@ -12,3 +6,19 @@ _Describe what problem this is solving, and how it's solved._
126

137
**Testing**
148
_Explain how this change is tested._
9+
10+
<!--
11+
Thanks for filing! The codeowners file will automatically request reviews from the appropriate teams.
12+
13+
After you get a review and have addressed any comments, please explicitly re-request a review from the
14+
person(s) who reviewed your changes. This will make sure it gets re-added to their review queue - you're no bothering us!
15+
-->
16+
17+
**Checklist**
18+
19+
- [ ] Run `cargo fmt`.
20+
- [ ] Run `cargo clippy`. If applicable, add:
21+
- [ ] `--target wasm32-unknown-unknown`
22+
- [ ] `--target wasm32-unknown-emscripten`
23+
- [ ] Run `cargo xtask test` to run tests.
24+
- [ ] Add change to `CHANGELOG.md`. See simple instructions inside file.

0 commit comments

Comments
 (0)