Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove WORKAROUND_OLD_WEBGL_UNIFORM_UPLOAD_IGNORED_OFFSET_BUG #20925

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Remove WORKAROUND_OLD_WEBGL_UNIFORM_UPLOAD_IGNORED_OFFSET_BUG #20925

merged 1 commit into from
Dec 14, 2023

Conversation

sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Dec 14, 2023

See #7459

@sbc100 sbc100 mentioned this pull request Dec 14, 2023
Merged
juj
juj approved these changes Dec 14, 2023
View reviewed changes
Copy link
Collaborator

@juj juj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

kripken
kripken approved these changes Dec 14, 2023
View reviewed changes
ChangeLog.md Outdated Show resolved Hide resolved
@sbc100 sbc100 enabled auto-merge (squash) December 14, 2023 22:59
@sbc100 sbc100 merged commit 0c95291 into emscripten-core:main Dec 14, 2023
25 of 27 checks passed
@sbc100 sbc100 deleted the remove_workaround branch December 14, 2023 23:59
@sbc100 sbc100 mentioned this pull request Dec 15, 2023
Merged
sbc100 added a commit to sbc100/emscripten that referenced this pull request Mar 20, 2024
@sbc100
Fix for zero count in glUniform family of functions
6965ad3 
The previous fix for this was in emscripten-core#16837, but I looks like that only
covered the new "garbage-free" webgl2 path.  When old webgl1 path was
still using the zero count value.  For example the following line was
unguarded:

```
var view = miniTempWebGLFloatBuffers[4 * count - 1];
```

This recently resurfaced because I introduced
`WEBGL_USE_GARBAGE_FREE_APIS` which is currently disabled for memories
larger 2gb.  This meant that users with large memories were forces onto
the old path where the bug still existed.

Rather than adding yet more `count &&` prefixes, this patch simply adds
a single early return at the top of each function.

As part of this change I resurrected
`test_webgl_draw_triangle_with_uniform_color.c` which has not actually
be used since emscripten-core#20925.

Fixes: emscripten-core#21567
@sbc100 sbc100 mentioned this pull request Mar 20, 2024
Merged
sbc100 added a commit to sbc100/emscripten that referenced this pull request Mar 21, 2024
@sbc100
Fix for zero count in glUniform family of functions
27ff4fd 
As part of this change I resurrected
`test_webgl_draw_triangle_with_uniform_color.c` which has not actually
be used since emscripten-core#20925.

Fixes: emscripten-core#21567
sbc100 added a commit to sbc100/emscripten that referenced this pull request Mar 21, 2024
@sbc100
Fix for zero count in glUniform family of functions
993ab3a 
The previous fix for this was in emscripten-core#16837, but I looks like that only
covered the new "garbage-free" webgl2 path.  When old webgl1 path was
still using the zero count value.

As part of this change I resurrected
`test_webgl_draw_triangle_with_uniform_color.c` which has not actually
be used since emscripten-core#20925.

Fixes: emscripten-core#21567
sbc100 added a commit to sbc100/emscripten that referenced this pull request Mar 21, 2024
@sbc100
Fix for zero count in glUniform family of functions
5fd7fc0 
The previous fix for this was in emscripten-core#16837, but I looks like that only
covered the new "garbage-free" webgl2 path.  When old webgl1 path was
still using the zero count value.

As part of this change I resurrected
`test_webgl_draw_triangle_with_uniform_color.c` which has not actually
be used since emscripten-core#20925.

Fixes: emscripten-core#21567
sbc100 added a commit that referenced this pull request Mar 26, 2024
@sbc100
Fix for zero count in glUniform family of functions (#21573)
65b26e3 
The previous fix for this was in #16837, but I looks like that only
covered the new "garbage-free" webgl2 path.  When old webgl1 path was
still using the zero count value.  For example the following line was
unguarded:

```
var view = miniTempWebGLFloatBuffers[4 * count - 1];
```

This recently resurfaced because I introduced
`WEBGL_USE_GARBAGE_FREE_APIS` which is currently disabled for memories
larger 2gb.  This meant that users with large memories were forces onto
the old path where the bug still existed.

Rather than adding yet more `count &&` prefixes, this patch simply adds
a single early return at the top of each function.

As part of this change I resurrected
`test_webgl_draw_triangle_with_uniform_color.c` which has not actually
be used since #20925.

Fixes: #21567
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kripken kripken kripken approved these changes

@juj juj juj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sbc100 @kripken @juj