Skip to content

Commit 72c3be3

Browse files
authored
[wasm64] Fix glSharedSource in >4gb mode and enable test under wasm64 (#21184)
1 parent a23fdef commit 72c3be3

File tree

6 files changed

+19
-18
lines changed

6 files changed

+19
-18
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,7 @@ jobs:
816816
browser64_4gb.test_async_*
817817
browser64_4gb.test_audio_worklet*
818818
browser64_4gb.test_emscripten_log
819+
browser64_4gb.test_clientside_vertex_arrays_es3
819820
"
820821
test-browser-firefox:
821822
executor: bionic

src/library_webgl.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
425425
getSource: (shader, count, string, length) => {
426426
var source = '';
427427
for (var i = 0; i < count; ++i) {
428-
var len = length ? {{{ makeGetValue('length', 'i*4', 'i32') }}} : -1;
429-
source += UTF8ToString({{{ makeGetValue('string', 'i*4', 'i32') }}}, len < 0 ? undefined : len);
428+
var len = length ? {{{ makeGetValue('length', 'i*' * POINTER_SIZE, '*') }}} : undefined;
429+
source += UTF8ToString({{{ makeGetValue('string', 'i*' + POINTER_SIZE, '*') }}}, len);
430430
}
431431
#if LEGACY_GL_EMULATION
432432
// Let's see if we need to enable the standard derivatives extension

test/code_size/hello_webgl2_wasm.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 569,
33
"a.html.gz": 379,
4-
"a.js": 4697,
5-
"a.js.gz": 2419,
4+
"a.js": 4681,
5+
"a.js.gz": 2412,
66
"a.wasm": 10388,
77
"a.wasm.gz": 6692,
8-
"total": 15654,
9-
"total_gz": 9490
8+
"total": 15638,
9+
"total_gz": 9483
1010
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 567,
33
"a.html.gz": 379,
4-
"a.js": 17931,
5-
"a.js.gz": 8098,
4+
"a.js": 17917,
5+
"a.js.gz": 8089,
66
"a.mem": 3123,
77
"a.mem.gz": 2693,
8-
"total": 21621,
9-
"total_gz": 11170
8+
"total": 21607,
9+
"total_gz": 11161
1010
}

test/code_size/hello_webgl_wasm.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 569,
33
"a.html.gz": 379,
4-
"a.js": 4183,
5-
"a.js.gz": 2241,
4+
"a.js": 4167,
5+
"a.js.gz": 2236,
66
"a.wasm": 10388,
77
"a.wasm.gz": 6692,
8-
"total": 15140,
9-
"total_gz": 9312
8+
"total": 15124,
9+
"total_gz": 9307
1010
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 567,
33
"a.html.gz": 379,
4-
"a.js": 17409,
5-
"a.js.gz": 7912,
4+
"a.js": 17395,
5+
"a.js.gz": 7900,
66
"a.mem": 3123,
77
"a.mem.gz": 2693,
8-
"total": 21099,
9-
"total_gz": 10984
8+
"total": 21085,
9+
"total_gz": 10972
1010
}

0 commit comments

Comments
 (0)