RenderingDevice: Fix certain RD to Image format conversions #102805
Merged
+7
−4
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
fire
reviewed
Feb 13, 2025
| @@ -2553,6 +2551,7 @@ void TextureStorage::_texture_format_from_rd(RD::DataFormat p_rd_format, Texture | |||
| r_format.swizzle_b = RD::TEXTURE_SWIZZLE_B; | |||
| r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A; | |||
| } break; | |||
| /* already maps to FORMAT_ETC2_RGBA8 | |||
There was a problem hiding this comment.
We tend to delete code rather than comment out, is there a specific reason we're not doing that?
There was a problem hiding this comment.
I think it's done to explicitly state that there are certain Image formats to which we're not mapping to, since they're just swizzled variants of other formats.
|
Thanks! |
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.
Fixes #97628
Certain RD texture formats used to be incorrectly mapped to their
Image::Formatcounterparts. This PR fixesRGBAFand changesETC2 RGBA8, which used to convert toETC2_RA_As_RG, which is much less common now that we support ETC2_RG11, and it compliments the existing conversion ofBC3toDXT5instead ofDXT5_RA_As_RGASTC HDR conversion is broken currently, as it maps SRGB variants to HDR ones. This is fixed by #102777