fix(webgl) texture to texture copy; framebuffer state leak #2042
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
ibgreen
approved these changes
Mar 17, 2024
| @@ -181,7 +183,9 @@ function _copyTextureToBuffer(device: WebGLDevice, options: CopyTextureToBufferO | |||
| ); | |||
| } finally { | |||
| device.gl.bindBuffer(GL.PIXEL_PACK_BUFFER, null); | |||
| device.gl.bindFramebuffer(GL.FRAMEBUFFER, null); | |||
| if (prevHandle !== undefined) { | |||
There was a problem hiding this comment.
Hmm - When do we get undefined? When not instrumented?
Can we add a comment explaining why we do not reset in this case.
There was a problem hiding this comment.
The assignment of prevHandle is in a try/catch so the code may not get executed.
| // destinationZ = destinationZ || 0; | ||
| device.gl.bindFramebuffer(GL.FRAMEBUFFER, framebuffer.handle); | ||
| // @ts-expect-error native bindFramebuffer is overridden by our state tracker | ||
| const prevHandle: WebGLFramebuffer | null = device.gl.bindFramebuffer( |
There was a problem hiding this comment.
Not in a try/catch.
| switch (textureTarget) { | ||
| case GL.TEXTURE_2D: | ||
| case GL.TEXTURE_CUBE_MAP: | ||
| device.gl.copyTexSubImage2D( |
There was a problem hiding this comment.
There are new helper functions for 9.1 in webgl-texture-helpers that take care of calling the right webgl function and handle more cases, but if this is meant for cherry-pick to 9.0 the maybe aligning with those can be a separate step.
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.
Change List
WEBGLFramebufferconstructor resets framebuffer binding to previous handle instead of nullWEBGLCommandBuffercopy-texture-to-buffer resets framebuffer binding to previous handle instead of nullWEBGLCommandBuffercopy-texture-to-texture