Skip to content

[wasm64] Fix glSharedSource in >4gb mode and enable test under wasm64 #21184

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.

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

Merged
merged 1 commit into from
Jan 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,7 @@ jobs:
browser64_4gb.test_async_*
browser64_4gb.test_audio_worklet*
browser64_4gb.test_emscripten_log
browser64_4gb.test_clientside_vertex_arrays_es3
"
test-browser-firefox:
executor: bionic
Expand Down
4 changes: 2 additions & 2 deletions src/library_webgl.js
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
getSource: (shader, count, string, length) => {
var source = '';
for (var i = 0; i < count; ++i) {
var len = length ? {{{ makeGetValue('length', 'i*4', 'i32') }}} : -1;
source += UTF8ToString({{{ makeGetValue('string', 'i*4', 'i32') }}}, len < 0 ? undefined : len);
var len = length ? {{{ makeGetValue('length', 'i*' * POINTER_SIZE, '*') }}} : undefined;
source += UTF8ToString({{{ makeGetValue('string', 'i*' + POINTER_SIZE, '*') }}}, len);
}
#if LEGACY_GL_EMULATION
// Let's see if we need to enable the standard derivatives extension
Expand Down
8 changes: 4 additions & 4 deletions test/code_size/hello_webgl2_wasm.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.html": 569,
"a.html.gz": 379,
"a.js": 4697,
"a.js.gz": 2419,
"a.js": 4681,
"a.js.gz": 2412,
"a.wasm": 10388,
"a.wasm.gz": 6692,
"total": 15654,
"total_gz": 9490
"total": 15638,
"total_gz": 9483
}
8 changes: 4 additions & 4 deletions test/code_size/hello_webgl2_wasm2js.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.html": 567,
"a.html.gz": 379,
"a.js": 17931,
"a.js.gz": 8098,
"a.js": 17917,
"a.js.gz": 8089,
"a.mem": 3123,
"a.mem.gz": 2693,
"total": 21621,
"total_gz": 11170
"total": 21607,
"total_gz": 11161
}
8 changes: 4 additions & 4 deletions test/code_size/hello_webgl_wasm.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.html": 569,
"a.html.gz": 379,
"a.js": 4183,
"a.js.gz": 2241,
"a.js": 4167,
"a.js.gz": 2236,
"a.wasm": 10388,
"a.wasm.gz": 6692,
"total": 15140,
"total_gz": 9312
"total": 15124,
"total_gz": 9307
}
8 changes: 4 additions & 4 deletions test/code_size/hello_webgl_wasm2js.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.html": 567,
"a.html.gz": 379,
"a.js": 17409,
"a.js.gz": 7912,
"a.js": 17395,
"a.js.gz": 7900,
"a.mem": 3123,
"a.mem.gz": 2693,
"total": 21099,
"total_gz": 10984
"total": 21085,
"total_gz": 10972
}