Skip to content

Commit

Permalink
Merge pull request #2 from Vecvec/ray-tracing
Browse files Browse the repository at this point in the history
upgrade ray-tracing branch to main branch
  • Loading branch information
daniel-keitel authored Jan 17, 2024
2 parents c789f7f + 316f0e2 commit f39a44c
Show file tree
Hide file tree
Showing 1,072 changed files with 167,349 additions and 22,316 deletions.
7 changes: 7 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[alias]
xtask = "run --manifest-path xtask/Cargo.toml"

[build]
rustflags = [
"--cfg=web_sys_unstable_apis"
]
9 changes: 9 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# None of our tests should take longer than 45s, and if they've gone 2x that,
# terminate them to prevent infinite run-on.
[profile.default]
slow-timeout = { period = "45s", terminate-after = 2 }

# Use two threads for tests with "2_threads" in their name
[[profile.default.overrides]]
filter = 'test(~2_threads)'
threads-required = 2
14 changes: 9 additions & 5 deletions .deny.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[bans]
multiple-versions = "deny"
skip-tree = [
{ name = "cts_runner" },
{ name = "player" },
{ name = "wgpu-info" },
{ name = "windows-sys", version = "0.45" },
{ name = "winit", version = "0.27.5" },
{ name = "rustc_version", version = "0.2.3" },
]
skip = [
{ name = "wgpu" }
]
wildcards = "deny"

Expand All @@ -19,14 +18,19 @@ allow = [
"CC0-1.0",
"ISC",
"MIT",
"MPL-2.0",
"MIT-0",
"Unicode-DFS-2016",
"Zlib",
]

[sources]
allow-git = [
# Waiting on releases; used in examples only
"https://github.com/SiegeEngine/ddsfile",
"https://github.com/Razaekel/noise-rs",

"https://github.com/grovesNL/glow",
"https://github.com/gfx-rs/metal-rs",
]
unknown-registry = "deny"
unknown-git = "deny"
Expand Down
12 changes: 10 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
/cts_runner/ @crowlKats
/deno_webgpu/ @crowlKats
* @gfx-rs/wgpu

/cts_runner/ @gfx-rs/deno @gfx-rs/wgpu
/deno_webgpu/ @gfx-rs/deno @gfx-rs/wgpu
/naga/ @gfx-rs/naga
/naga-cli/ @gfx-rs/naga

# We leave the codeowners empty for the changelog, so naga changes
# don't trigger wgpu reviews and vise versa.
/CHANGELOG.md
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Issues with shaders
url: https://github.com/gfx-rs/naga/issues/new/choose
about: Issues with or enhancements for the shader translation.
- name: Question about wgpu
url: https://github.com/gfx-rs/wgpu/discussions/new
about: Any questions about how to use wgpu should go here.
19 changes: 17 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,24 @@ updates:
- package-ecosystem: cargo
directory: /
schedule:
interval: daily
interval: weekly
# This allows dependabot to update _all_ lockfile packages.
#
# These will be grouped into the existing group update PRs, so shoudn't generate additional jobs.
allow:
# Allow both direct and indirect updates for all packages
- dependency-type: "all"
# Waiting on https://github.com/dependabot/dependabot-core/issues/4009 to be resolved, shouldn't be long.
# versioning-strategy: increase-if-necessary
groups:
patch-updates:
patterns:
- "*"
update-types:
- "minor"
- "patch"

- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
interval: weekly
22 changes: 16 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
**Checklist**

- [ ] Run `cargo clippy`.
- [ ] Run `cargo clippy --target wasm32-unknown-unknown` if applicable.
- [ ] Add change to CHANGELOG.md. See simple instructions inside file.

**Connections**
_Link to the issues addressed by this PR, or dependent PRs in other repositories_

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

**Testing**
_Explain how this change is tested._

<!--
Thanks for filing! The codeowners file will automatically request reviews from the appropriate teams.
After you get a review and have addressed any comments, please explicitly re-request a review from the
person(s) who reviewed your changes. This will make sure it gets re-added to their review queue - you're no bothering us!
-->

**Checklist**

- [ ] Run `cargo fmt`.
- [ ] Run `cargo clippy`. If applicable, add:
- [ ] `--target wasm32-unknown-unknown`
- [ ] `--target wasm32-unknown-emscripten`
- [ ] Run `cargo xtask test` to run tests.
- [ ] Add change to `CHANGELOG.md`. See simple instructions inside file.
Loading

0 comments on commit f39a44c

Please sign in to comment.