Clean up two recently introduced WebGL errors #97379
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
dsnopek
approved these changes
Sep 23, 2024
There was a problem hiding this comment.
Thanks!
I can't comment on the backbuffer change, but regarding the glDisable(GL_FRAMEBUFFER_SRGB) change: I retested the issue that PR #95433 aimed to fix, and it's still fixed with these changes! The code looks good to me as well.
Given that PR #95433 was cherry-picked for Godot 4.3.1, this one should be cherry-picked too. Hopefully, that's OK for the backbuffer-related fix as well?
dsnopek
added
the
cherrypick:4.3
|
Thanks! |
|
Cherry-picked for 4.3.1. |
akien-mga
removed
the
cherrypick:4.3
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: #97369
There are 2 errors here:
glTexParameterican only be called on an existing texture (unlikeglBindTexturewhich is immediately above it)GL_FRAMEBUFFER_SRGBis only available on desktop platforms. On Mobile/Web attempting to disable it results in an error. Unless theEXT_sRGB_write_controlextension is available. In which caseGL_FRAMEBUFFER_SRGB_EXTis available (the same value asGL_FRAMEBUFFER_SRGB) AND it is enabled by default 💀 . Therefore, we have to check for the extension and then only disable when its available.CC @dsnopek with respect to the
GL_FRAMEBUFFER_SRGBcode