etc2comp: Fix max iterations for RGBA channels #37488
Merged
+248
−24
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
Those checks were *very likely* meant to clamp the max value, not the min one. Fixes godotengine#10059 (comment).
|
I had made the same change locally, and it fixed the freezing on import. Not 100% sure if the etc2 textures look correct. Never actually validated them. I'm hoping somebody on the etc2comp repo responds as to whether or not that's the correct fix. Is the patch file supposed to be included in this commit? |
Yes, we add patches for third-party libraries to version control so we can apply them again if we update etc2comp in the future. |
akien-mga
added
the
cherrypick:3.x
|
I tested with Jetpaca switching it to GLES3 / ETC2 import with all PNGs imported as VRAM compressed, and I don't see any particular issue with the imported textures, so that should work for the basic regression testing. |
|
Cherry-picked for 3.2.2. |
akien-mga
removed
the
cherrypick:3.x
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.
Those checks were very likely meant to clamp the max value,
not the min one.
Fixes #10059 (comment).
I have yet to do tests to check if etc2 import still seems to work properly.
CC @jitspoe