Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure that pipeline creation errors register layouts as errors also #4624

Merged
merged 27 commits into from
Nov 6, 2023
Merged

Ensure that pipeline creation errors register layouts as errors also #4624

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
81d5908
Ensure that pipeline creation errors register layouts as errors also
bradwerth Nov 2, 2023
b2c8b81
Updated CHANGELOG.md.
bradwerth Nov 3, 2023
4d28bb7
Merge branch 'trunk' into registerImplicitPipelineLayouts
bradwerth Nov 3, 2023
7a345b6
Before adding errors, remove existing elements, if present.
bradwerth Nov 3, 2023
9501ccc
Use HLSL 2018 (#4629)
daxpedda Nov 4, 2023
dfa7e2f
Fix publish script
cwfitzgerald Nov 5, 2023
8547226
Rewrite Example Event Loop (#4634)
cwfitzgerald Nov 6, 2023
873f19d
Fix Panic in Surface Configure (#4635)
cwfitzgerald Nov 6, 2023
bc7f4be
Fix wasm examples (#4639)
cwfitzgerald Nov 6, 2023
e7e2f2a
vulkan: Log validation layer messages during instance creation/destru…
exrook Nov 6, 2023
b9b4a41
Bump libc from 0.2.149 to 0.2.150 (#4636)
dependabot[bot] Nov 6, 2023
fe1429b
Bump wasm-bindgen-test from 0.3.37 to 0.3.38 (#4637)
dependabot[bot] Nov 6, 2023
0004e96
Bump syn from 2.0.38 to 2.0.39 (#4638)
dependabot[bot] Nov 6, 2023
0dad159
Pass 3 on examples (#4640)
cwfitzgerald Nov 6, 2023
267bd48
[naga wgsl-in] Introduce `Scalar` type.
jimblandy Nov 5, 2023
7f72c9f
Fix GL Push Constant Layout (#4607)
cwfitzgerald Nov 6, 2023
261cb7c
Check if `source` is empty when constructing `hal::DebugSource`
teoxoy Nov 6, 2023
1d4fa81
Gate usage of `metal::ComputePassDescriptor` on timestamp query suppo…
teoxoy Nov 6, 2023
70d8004
Review fixes.
bradwerth Nov 6, 2023
6387ed9
Ensure that pipeline creation errors register layouts as errors also
bradwerth Nov 2, 2023
ed1a520
Updated CHANGELOG.md.
bradwerth Nov 3, 2023
fa0adbd
Before adding errors, remove existing elements, if present.
bradwerth Nov 3, 2023
b9b9b4f
Review fixes.
bradwerth Nov 6, 2023
b1049df
Merge branch 'registerImplicitPipelineLayouts' of https://github.com/…
bradwerth Nov 6, 2023
fb3de58
Ensure that pipeline creation errors register layouts as errors also
bradwerth Nov 2, 2023
8f2db1a
Before adding errors, remove existing elements, if present.
bradwerth Nov 3, 2023
7fbe0a0
Merge branch 'registerImplicitPipelineLayouts' of https://github.com/…
bradwerth Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Review fixes.
  • Loading branch information
@bradwerth
bradwerth committed Nov 6, 2023
commit 70d8004c1ef79b2d18e2e632a18aa1ee502ac521
8 changes: 4 additions & 4 deletions wgpu-core/src/device/global.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,8 +1901,8 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {

let id = fid.assign_error(desc.label.borrow_or_default(), &mut token);

// We also need to assign errors to the pipeline layout and the bind
// group layout. We have to remove any existing entries first.
// We also need to assign errors to the implicit pipeline layout and the
// implicit bind group layout. We have to remove any existing entries first.
let (mut pipeline_layout_guard, mut token) = hub.pipeline_layouts.write(&mut token);
let (mut bgl_guard, _token) = hub.bind_group_layouts.write(&mut token);
if let Some(ref ids) = implicit_error_context {
Expand Down Expand Up @@ -2088,8 +2088,8 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {

let id = fid.assign_error(desc.label.borrow_or_default(), &mut token);

// We also need to assign errors to the pipeline layout and the bind
// group layout. We have to remove any existing entries first.
// We also need to assign errors to the implicit pipeline layout and the
// implicit bind group layout. We have to remove any existing entries first.
let (mut pipeline_layout_guard, mut token) = hub.pipeline_layouts.write(&mut token);
let (mut bgl_guard, _token) = hub.bind_group_layouts.write(&mut token);
if let Some(ref ids) = implicit_error_context {
Expand Down
Loading