webgl: Fix errors on some glUniform calls with memory size over 2GiB in WebGL2 #21819
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
…in WebGL2 In emscripten-core#21445, temporary buffers were appropriately included in dependencies. But in the following emscripten-core#21462 they were overlooked, resulting in errors on certain GL calls when memory size exceeded 2GiB in WebGL2. This pull request aims to fix this issue.
sbc100
reviewed
Apr 24, 2024
src/library_webgl.js
Outdated
| @@ -2412,7 +2412,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}}; | |||
| }, | |||
|
|
|||
| glUniform1iv__deps: ['$webglGetUniformLocation' | |||
| #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1 | |||
| #if GL_POOL_TEMP_BUFFERS && !(MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS) | |||
There was a problem hiding this comment.
I think this maybe reads better as (MIN_WEBGL_VERSION == 1 || !WEBGL_USE_GARBAGE_FREE_APIS).
I can read that as "if we are using WebGL 1 or we can't use the garbage free API".
I know that is kind of the opposite of how its written in the code ..
sbc100
approved these changes
Apr 25, 2024
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.
In #21445, temporary buffers were appropriately included in dependencies. But in the following #21462 they were overlooked, resulting in errors on certain GL calls when memory size exceeded 2GiB in WebGL2. This pull request aims to fix this issue.