-
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Fix placeholder SMAA LUTs #24398
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.
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
Open
redstrate
wants to merge
1
commit into
bevyengine:main
Choose a base branch
from
redstrate:work/josh/bevy-fix-smaa-lut
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+26
−3
Open
Fix placeholder SMAA LUTs #24398
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,8 +31,6 @@ | |
| //! [SMAA]: https://www.iryoku.com/smaa/ | ||
| use bevy_app::{App, Plugin}; | ||
| use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Handle}; | ||
| #[cfg(not(feature = "smaa_luts"))] | ||
| use bevy_core_pipeline::tonemapping::lut_placeholder; | ||
| use bevy_core_pipeline::{ | ||
| schedule::{Core2d, Core2dSystems, Core3d, Core3dSystems}, | ||
| tonemapping::tonemapping, | ||
|
|
@@ -322,8 +320,33 @@ impl Plugin for SmaaPlugin { | |
| }; | ||
| #[cfg(not(feature = "smaa_luts"))] | ||
| let smaa_luts = { | ||
| use bevy_asset::RenderAssetUsages; | ||
| use bevy_image::ImageSampler; | ||
| use bevy_render::render_resource::{Extent3d, TextureDataOrder}; | ||
|
|
||
| let mut images = app.world_mut().resource_mut::<bevy_asset::Assets<Image>>(); | ||
| let handle = images.add(lut_placeholder()); | ||
|
|
||
| let format = TextureFormat::Rgba8Unorm; | ||
| let data = vec![255, 0, 255, 255]; | ||
| let handle = images.add(Image { | ||
| data: Some(data), | ||
| data_order: TextureDataOrder::default(), | ||
| texture_descriptor: TextureDescriptor { | ||
| size: Extent3d::default(), | ||
| format, | ||
| dimension: TextureDimension::D2, | ||
| label: None, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: Label it please |
||
| mip_level_count: 1, | ||
| sample_count: 1, | ||
| usage: TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST, | ||
| view_formats: &[], | ||
| }, | ||
| sampler: ImageSampler::Default, | ||
| texture_view_descriptor: None, | ||
| asset_usage: RenderAssetUsages::RENDER_WORLD, | ||
| copy_on_resize: false, | ||
| }); | ||
|
|
||
| SmaaLuts { | ||
| area_lut: handle.clone(), | ||
| search_lut: handle.clone(), | ||
|
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want to keep the copy/paste and to help prevent people from asking “why isn’t this using lut_placeholder"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re: #24398 (review)