[BREAKING] Wrap ShaderSource::Naga in Cow<'static>
#2903
Merged
Conversation
This file contains 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
daxpedda
force-pushed
the
shader-source-naga-cow-static
branch
4 times, most recently
from
88792c2 to
7246ad7
Compare
This was referenced Aug 7, 2022
daxpedda
force-pushed
the
shader-source-naga-cow-static
branch
2 times, most recently
from
78cbb02 to
d100286
Compare
|
Could you provide an example that this change fixes? Is there another way to handle it without changing this type? |
// I'm hiding some stuff here, but I've done this with a proc-macro
// and using `serde` to deserialize the `Module` in a `Lazy`.
const MODULE: &'static Module = ...;
// With the PR.
let source = ShaderModuleDescriptor {
label: None,
source: ShaderSource::Naga(Cow::Borrowed(MODULE)),
};
// Without the PR.
let source = ShaderModuleDescriptor {
label: None,
source: ShaderSource::Naga(MODULE.clone()),
};
// With the PR, I can now keep re-using the `Module` without having to clone it unnecessarily.
device.create_shader_module(source);I hope this explains it.
Not that I'm aware of, unless we want to carry around a lifetime I guess. |
|
Probably related: #2801. |
daxpedda
force-pushed
the
shader-source-naga-cow-static
branch
from
d100286 to
92f4db5
Compare
|
Now that gfx-rs/naga#2013 was merged, I updated the relevant parts to depend on it. |
|
I think CI isn't failing because of this PR, it fails with the same errors in the latest commit on master too. |
3 tasks
daxpedda
force-pushed
the
shader-source-naga-cow-static
branch
from
92f4db5 to
0e531a5
Compare
daxpedda
force-pushed
the
shader-source-naga-cow-static
branch
from
96056e3 to
deed644
Compare
|
Added CHANGELOG entry and rebased, not sure why CI fails now, but it doesn't look like it's because of this PR. |
daxpedda
force-pushed
the
shader-source-naga-cow-static
branch
from
deed644 to
7b1abf8
Compare
|
Rebased after #3008. |
cwfitzgerald
approved these changes
Sep 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Checklist
cargo clippy.RUSTFLAGS=--cfg=web_sys_unstable_apis cargo clippy --target wasm32-unknown-unknownif applicable.Connections
Depends on gfx-rs/naga#2013.
Description
I'm currently pre-compiling shaders and storing them as
const, butShaderSource::Nagawants to ownnaga::Modules, as far as I understand, for good reasons, because it stores them, so not owning them would be problematic. UsingCow<'static, Module>, solves this, even if it looks strange.Testing
None.