Merged
Conversation
kvark
approved these changes
Jan 23, 2021
Member
kvark
left a comment
There was a problem hiding this comment.
Highly appreciate that PR description, thank you!
bors r+
Contributor
bors bot
added a commit
to gfx-rs/wgpu-rs
that referenced
this pull request
Jan 23, 2021
726: Bump wgpu-core and update texture_view_drop call r=kvark a=mkeeter This PR updates to the latest `wgpu-core` commit ([wgpu #1163](gfx-rs/wgpu#1163)), and is the counterpart to [wgpu-native #66](gfx-rs/wgpu-native#66). I'm using `wait = false` in the `texture_view_drop` call to match `buffer_drop` and `texture_drop` elsewhere `backend/direct.rs`, though I don't quite understand the implications 😅 Co-authored-by: Matt Keeter <matt.j.keeter@gmail.com>
bors bot
added a commit
to gfx-rs/wgpu-native
that referenced
this pull request
Jan 23, 2021
66: Draft of wgpu-core bump r=kvark a=mkeeter This is a draft PR to be merged after `wgpu-core` is bumped to use the latest `gfx` in [this PR](gfx-rs/wgpu#1163) - Updates `cbindgen` instructions - Rebuilds `wgpu/ffi.h` header - Adds `bool now` to `wgpu_texture_view_destroy` to match other `_destroy` functions which take a bool - Renames `now` → `wait` in `wgpu_texture_destroy` to match other `_destroy` functions which take a bool This required one hand-edit of `wgpu.h` (commit 8c29d4b) to fix an issue where it mis-translated an `enum` into a `struct`; not sure why this happened. (the CI build is going to fail, because I'm waiting for the `gfx` PR to be merged before bumping hashes in `Cargo.toml`) Co-authored-by: Matt Keeter <matt.j.keeter@gmail.com>
bors bot
added a commit
to gfx-rs/wgpu-native
that referenced
this pull request
Jan 23, 2021
66: Draft of wgpu-core bump r=kvark a=mkeeter This is a draft PR to be merged after `wgpu-core` is bumped to use the latest `gfx` in [this PR](gfx-rs/wgpu#1163) - Updates `cbindgen` instructions - Rebuilds `wgpu/ffi.h` header - Adds `bool now` to `wgpu_texture_view_destroy` to match other `_destroy` functions which take a bool - Renames `now` → `wait` in `wgpu_texture_destroy` to match other `_destroy` functions which take a bool This required one hand-edit of `wgpu.h` (commit 8c29d4b) to fix an issue where it mis-translated an `enum` into a `struct`; not sure why this happened. (the CI build is going to fail, because I'm waiting for the `gfx` PR to be merged before bumping hashes in `Cargo.toml`) Co-authored-by: Matt Keeter <matt.j.keeter@gmail.com>
bors bot
added a commit
to gfx-rs/wgpu-native
that referenced
this pull request
Feb 2, 2021
66: Draft of wgpu-core bump r=kvark a=mkeeter This is a draft PR to be merged after `wgpu-core` is bumped to use the latest `gfx` in [this PR](gfx-rs/wgpu#1163) - Updates `cbindgen` instructions - Rebuilds `wgpu/ffi.h` header - Adds `bool now` to `wgpu_texture_view_destroy` to match other `_destroy` functions which take a bool - Renames `now` → `wait` in `wgpu_texture_destroy` to match other `_destroy` functions which take a bool This required one hand-edit of `wgpu.h` (commit 8c29d4b) to fix an issue where it mis-translated an `enum` into a `struct`; not sure why this happened. (the CI build is going to fail, because I'm waiting for the `gfx` PR to be merged before bumping hashes in `Cargo.toml`) Co-authored-by: Matt Keeter <matt.j.keeter@gmail.com>
kvark
pushed a commit
to kvark/wgpu
that referenced
this pull request
Jun 3, 2021
726: Bump wgpu-core and update texture_view_drop call r=kvark a=mkeeter This PR updates to the latest `wgpu-core` commit ([wgpu gfx-rs#1163](gfx-rs#1163)), and is the counterpart to [wgpu-native gfx-rs#66](gfx-rs/wgpu-native#66). I'm using `wait = false` in the `texture_view_drop` call to match `buffer_drop` and `texture_drop` elsewhere `backend/direct.rs`, though I don't quite understand the implications 😅 Co-authored-by: Matt Keeter <matt.j.keeter@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Connections
gfxto #3610, and also includes #3608 and #3609wgpu-nativewgpu-rsrequires a one-line fix to thetexture_view_dropcall (which now takes a boolean); I can PR this next.Description
This fixes pathological shader complexity in SPIRV-Cross, as well as a few other
gfxPRs.Testing
I updated
wgpu-nativeto use this branch, then updated my toy raytracer to use the resultingdylibsand confirmed that it no longer takes forever to compile the pathological shader.In addition, I updated
wgpu-rsand went through the examples; nothing seems out of place.