upgrade ray-tracing branch to main branch #2

Vecvec · 2023-12-13T21:08:52Z

Connections
upgrades this branch to wgpu trunk, also fixes the tlas memory leak for me

Description
This branch is missing a lot of commits, this PR adds those, and also brings the tlas and blas structs up to work with those changes.

Testing
Tested with the three examples added by this change, as well as a basic program that (in a loop) creates blas and tlas, and immediately frees them.

Checklist

Run cargo fmt.
Run cargo clippy. If applicable, add:
- --target wasm32-unknown-unknown (done by github actions)
- --target wasm32-unknown-emscripten (done by github actions)
Run cargo xtask test to run tests. (done by github actions)
Add change to CHANGELOG.md. I do not think this is applicable as this is part of the ray-tracing PR ([wgpu-core] Inline RayQuery Support gfx-rs/wgpu#3631).

Now ready for review

…fx-rs#4782)

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>

Bumps [js-sys](https://github.com/rustwasm/wasm-bindgen) from 0.3.65 to 0.3.66. - [Release notes](https://github.com/rustwasm/wasm-bindgen/releases) - [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustwasm/wasm-bindgen/commits) --- updated-dependencies: - dependency-name: js-sys dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#4798) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.4.3 to 4.5.0. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.4.3...v4.5.0) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [web-sys](https://github.com/rustwasm/wasm-bindgen) from 0.3.65 to 0.3.66. - [Release notes](https://github.com/rustwasm/wasm-bindgen/releases) - [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustwasm/wasm-bindgen/commits) --- updated-dependencies: - dependency-name: web-sys dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Introduce new variants of `naga::ScalarKind`, `AbstractInt` and `AbstractFloat`, for representing WGSL abstract types.

Introduce new variants of `naga::Literal`, `AbstractInt` and `AbstractFloat`, for representing WGSL abstract values.

The large `match` statement in `Lowerer::construct` seems to flop back and forth between two indentation levels as it's edited, making the diffs hard to read. Rewrite it to use deferred initialization of `expr`, so that `cargo fmt` doesn't have to decide whether or not to put the `match` on the same line as `let expr`. This makes subsequent diffs easier to read.

Delete the `first_component_ty_inner` field from `front::wgsl::lower::construction::Components::Many`. With the introduction of abstract types, it will no longer be possible to infer the type of the vector being constructed by looking at the type of its first constructor argument alone: automatic conversion rules might need to be applied to that argument.

Co-authored-by: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com>

When a constructor builtin has an explicit type parameter, like `mat2x2<f32>`, it should not produce an abstract matrix, even if its arguments are abstract.

Bumps [wasm-bindgen-futures](https://github.com/rustwasm/wasm-bindgen) from 0.4.38 to 0.4.39. - [Release notes](https://github.com/rustwasm/wasm-bindgen/releases) - [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustwasm/wasm-bindgen/commits) --- updated-dependencies: - dependency-name: wasm-bindgen-futures dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…d size ... is outside of the supported range` warning) (gfx-rs#4796) * Remove surface extent validation * silence pnext vulkan validation warning which can happen on surface resize * remove old VUID-VkSwapchainCreateInfoKHR-imageExtent-01689 validation warning ignore * Validate surface against max texture size

…ures`

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#5028)

daniel-keitel · 2024-01-10T22:48:46Z

@Vecvec the main change I am contemplating, is to somehow make the information stored in the creation info part of the wgpu-core library and reference count all required resources.

The problem at the moment is, that a reference to Blas is required to build/update the blas, so lifetimes get in the way sometimes.
Another problem is that acceleration structures don't keep there resources alive. (You get an error if you drop a vertex buffer used in a ac, when it is used).
I think it would be better (and more performant to validate), if it worked like Texture and TextureView, where the view keeps the texture alive if the Texture is dropped.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…fx-rs#5036)

* Remove the Destroyed state from Storage It used to be how we handled destroying buffers and textures but we moved to different approach. * Explicit check for destroyed textures/buffers in a few entry points This used to be checked automatically when getting the resource from the registry, but has to be done manually now that we track we track the destroyed state in the resources.

…s#4984)

* Prevent a few integer overflows * Add a changelog entry * use u64

* Convert Tests to Use Async Poll * Update examples/src/repeated_compute/mod.rs Co-authored-by: Andreas Reich <r_andreas2@web.de> --------- Co-authored-by: Andreas Reich <r_andreas2@web.de>

…gfx-rs#5032) This clarifies that the Rust and C-style callbacks/closures need to be consumed (not called) before they are dropped. It also makes the from_c function consume the param closure so that it can be dropped without panicking. It also relaxes the restriction that the callback/closure can only be called once.

…-rs#5044) * Rename backends: web -> webgpu, direct -> wgpu_core * rename context objects for web & core * allow webgpu & webgl features side-by-side * make sure webgl ci doesn't use webgpu * update any_backend_feature_enabled * add panicing generate_report method for compatibility * RequestDeviceErrorKind::Web rename, fixup various cfg attributes * automatic webgpu support detection * changelog entry * fix emscripten * fix weird cfg, fix comment typo * remove try_generate_report again * Make get_mapped_range_as_array_buffer WebGPU only again

# Conflicts: # wgpu-core/src/device/life.rs # wgpu/src/backend/wgpu_core.rs

daniel-keitel · 2024-01-17T01:31:59Z

examples/src/ray_scene/mod.rs


-    load_model(&mut scene, "/examples/ray-scene/cube.obj");
+    load_model(&mut scene, "/ray_scene/cube.obj");


Suggested change

load_model(&mut scene, "/ray_scene/cube.obj");

load_model(&mut scene, "/skybox/models/teslacyberv3.0.obj");

daniel-keitel · 2024-01-17T01:33:23Z

examples/src/ray_scene/mod.rs

@@ -482,10 +475,14 @@ impl wgpu_example::framework::Example for Example {
                for y in 0..side_count {
                    let instance = self
                        .tlas_package
-                        .get_mut_single((x + y * side_count) as usize)
+                        .get_mut_single((x + y) * side_count)
                        .unwrap();


With this change the example should behave like before

Suggested change

.unwrap();

.get_mut_single(x + y * side_count)

torokati44 and others added 30 commits November 26, 2023 17:54

Bump web-sys to 0.3.65 (gfx-rs#4777)

2964eed

Fixes for Skybox and All Examples (gfx-rs#4780)

4f24c31

Remove resources ONLY when needed inside wgpu and not in user land (g…

2c67f79

…fx-rs#4782)

Don't keep a strong ref in storage for destroyed resources (gfx-rs#4786)

238c373

Fix Arcanization changelog (gfx-rs#4795)

fbbb7a0

Delete root.rs so git recognizes rename in following commit

00a8a9f

Rename gpu.rs to root.rs

f971183

Support nv12 texture format (gfx-rs#4573)

a6503e5

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>

Bump winit from 0.29.3 to 0.29.4 (gfx-rs#4784)

3a448b8

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

[naga] Introduce ScalarKind::AbstractInt and AbstractFloat.

276c978

Introduce new variants of `naga::ScalarKind`, `AbstractInt` and `AbstractFloat`, for representing WGSL abstract types.

[naga] Introduce Literal::AbstractInt and AbstractFloat.

e75fb3c

Introduce new variants of `naga::Literal`, `AbstractInt` and `AbstractFloat`, for representing WGSL abstract values.

[naga wgsl-in] Implement abstract types for consts, constructors.

601f235

[naga wgsl-in] Clarify match in automatic_conversion_join.

50a75fb

Co-authored-by: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com>

[naga] Improve snapshot output when validation fails.

85dd404

[naga wgsl-in] Matrix constructors have only float overloads.

fe4d412

[naga wgsl-in] Constructors with types don't make abstract values.

5a3887a

When a constructor builtin has an explicit type parameter, like `mat2x2<f32>`, it should not produce an abstract matrix, even if its arguments are abstract.

Add space to a comment inside make_spirv_raw (gfx-rs#4804)

c4ef520

rename DeviceDescriptor.features to `DeviceDescriptor.required_feat…

9be6c88

…ures`

rename DeviceDescriptor.limits to DeviceDescriptor.required_limits

da73522

improve features/limits docs

6ff5f8e

move alignments & downlevel .clone()s inside function

acdc9fc

add changelog entry

08506fe

[naga] Improve ConstantEvaluatorError::InvalidCastArg message.

a9c5821

jimblandy and others added 7 commits January 8, 2024 19:24

Prefer Arc::into_inner over Arc::try_unwrap. (gfx-rs#5018)

8af6975

Validate max_vertex_buffers in render bundles. (gfx-rs#5025)

1bc71eb

Don't case the dynamic offsets count to u8 (gfx-rs#5026)

58fe7ea

Validate that a binding offset fits in the buffer

37755b6

Fix a bounds check in remove_abandoned (gfx-rs#5024)

4400a58

Bump getrandom from 0.2.11 to 0.2.12 (gfx-rs#5030)

c367adf

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Don't crash if a texture is destroyed before queue submission (gfx-rs…

f27bb44

…#5028)

cwfitzgerald and others added 19 commits January 10, 2024 17:56

Add test -> check Dependency (gfx-rs#5033)

f7695b3

Dependabot Improvements (gfx-rs#5035)

cf01592

Bump the patch-updates group with 11 updates (gfx-rs#5039)

8c1658f

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Pin rust-cache-version (gfx-rs#5040)

2512b2d

Move the trace recording of destroy events out of triage_resources (g…

c90f43b

…fx-rs#5036)

Remove the free_resources tracker (gfx-rs#5037)

b30c0c2

Unify surface creation by introducing new SurfaceTarget enum (gfx-r…

4fd4a71

…s#4984)

Prevent a few integer overflows (gfx-rs#5042)

11c29c8

* Prevent a few integer overflows * Add a changelog entry * use u64

Triage suspected resources after triaging submissions (gfx-rs#5050)

376d901

Add proper timeouts to CI/nextest (gfx-rs#5051)

5fd7d22

Convert Tests to Use Async Poll (gfx-rs#5053)

ad625f4

* Convert Tests to Use Async Poll * Update examples/src/repeated_compute/mod.rs Co-authored-by: Andreas Reich <r_andreas2@web.de> --------- Co-authored-by: Andreas Reich <r_andreas2@web.de>

Fix DX12 Wait with Timeout (gfx-rs#5052)

552f06d

Add cfg_aliases to wgpu-core and wgpu-hal (gfx-rs#5055)

580340f

Merge remote-tracking branch 'gfx-rs/trunk' into ray-tracing

f2d5734

# Conflicts: # wgpu-core/src/device/life.rs # wgpu/src/backend/wgpu_core.rs

fix merge

8734e03

fix fmt

316f0e2

daniel-keitel reviewed Jan 17, 2024

View reviewed changes

daniel-keitel merged commit f39a44c into daniel-keitel:ray-tracing Jan 17, 2024
24 of 28 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upgrade ray-tracing branch to main branch #2

upgrade ray-tracing branch to main branch #2

Vecvec commented Dec 13, 2023 •

edited

Loading

daniel-keitel commented Jan 10, 2024

daniel-keitel Jan 17, 2024

daniel-keitel Jan 17, 2024


		load_model(&mut scene, "/examples/ray-scene/cube.obj");
		load_model(&mut scene, "/ray_scene/cube.obj");

	load_model(&mut scene, "/ray_scene/cube.obj");
	load_model(&mut scene, "/skybox/models/teslacyberv3.0.obj");

upgrade ray-tracing branch to main branch #2

upgrade ray-tracing branch to main branch #2

Conversation

Vecvec commented Dec 13, 2023 • edited Loading

daniel-keitel commented Jan 10, 2024

daniel-keitel Jan 17, 2024

Choose a reason for hiding this comment

daniel-keitel Jan 17, 2024

Choose a reason for hiding this comment

Vecvec commented Dec 13, 2023 •

edited

Loading