Skip to content

Commit 4f8ec6f

Browse files
sbc100sbc100
committed
Honor WEBGL_USE_GARBAGE_FREE_APIS
Followup to emscripten-core#21445. I overlooked some of the webgl2-only paths.
1 parent 53f661c commit 4f8ec6f

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎src/library_webgl.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2422,7 +2422,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
24222422
assert((value & 3) == 0, 'Pointer to integer data passed to glUniform1iv must be aligned to four bytes!');
24232423
#endif
24242424

2425-
#if MIN_WEBGL_VERSION >= 2
2425+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
24262426
#if GL_ASSERTIONS
24272427
assert(GL.currentContext.version >= 2);
24282428
#endif
@@ -2449,7 +2449,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
24492449
var view = {{{ makeHEAPView('32', 'value', 'value+count*4') }}};
24502450
}
24512451
GLctx.uniform1iv(webglGetUniformLocation(location), view);
2452-
#endif // MIN_WEBGL_VERSION >= 2
2452+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
24532453
},
24542454

24552455
glUniform2iv__deps: ['$webglGetUniformLocation'
@@ -2463,7 +2463,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
24632463
assert((value & 3) == 0, 'Pointer to integer data passed to glUniform2iv must be aligned to four bytes!');
24642464
#endif
24652465

2466-
#if MIN_WEBGL_VERSION >= 2
2466+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
24672467
#if GL_ASSERTIONS
24682468
assert(GL.currentContext.version >= 2);
24692469
#endif
@@ -2491,7 +2491,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
24912491
var view = {{{ makeHEAPView('32', 'value', 'value+count*8') }}};
24922492
}
24932493
GLctx.uniform2iv(webglGetUniformLocation(location), view);
2494-
#endif // MIN_WEBGL_VERSION >= 2
2494+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
24952495
},
24962496

24972497
glUniform3iv__deps: ['$webglGetUniformLocation'
@@ -2505,7 +2505,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
25052505
assert((value & 3) == 0, 'Pointer to integer data passed to glUniform3iv must be aligned to four bytes!');
25062506
#endif
25072507

2508-
#if MIN_WEBGL_VERSION >= 2
2508+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
25092509
#if GL_ASSERTIONS
25102510
assert(GL.currentContext.version >= 2);
25112511
#endif
@@ -2534,7 +2534,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
25342534
var view = {{{ makeHEAPView('32', 'value', 'value+count*12') }}};
25352535
}
25362536
GLctx.uniform3iv(webglGetUniformLocation(location), view);
2537-
#endif // MIN_WEBGL_VERSION >= 2
2537+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
25382538
},
25392539

25402540
glUniform4iv__deps: ['$webglGetUniformLocation'
@@ -2548,7 +2548,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
25482548
assert((value & 3) == 0, 'Pointer to integer data passed to glUniform4iv must be aligned to four bytes!');
25492549
#endif
25502550

2551-
#if MIN_WEBGL_VERSION >= 2
2551+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
25522552
#if GL_ASSERTIONS
25532553
assert(GL.currentContext.version >= 2);
25542554
#endif
@@ -2578,7 +2578,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
25782578
var view = {{{ makeHEAPView('32', 'value', 'value+count*16') }}};
25792579
}
25802580
GLctx.uniform4iv(webglGetUniformLocation(location), view);
2581-
#endif // MIN_WEBGL_VERSION >= 2
2581+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
25822582
},
25832583

25842584
glUniform1fv__deps: ['$webglGetUniformLocation'
@@ -2592,7 +2592,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
25922592
assert((value & 3) == 0, 'Pointer to float data passed to glUniform1fv must be aligned to four bytes!');
25932593
#endif
25942594

2595-
#if MIN_WEBGL_VERSION >= 2
2595+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
25962596
#if GL_ASSERTIONS
25972597
assert(GL.currentContext.version >= 2);
25982598
#endif
@@ -2619,7 +2619,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
26192619
var view = {{{ makeHEAPView('F32', 'value', 'value+count*4') }}};
26202620
}
26212621
GLctx.uniform1fv(webglGetUniformLocation(location), view);
2622-
#endif // MIN_WEBGL_VERSION >= 2
2622+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
26232623
},
26242624

26252625
glUniform2fv__deps: ['$webglGetUniformLocation'
@@ -2633,7 +2633,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
26332633
assert((value & 3) == 0, 'Pointer to float data passed to glUniform2fv must be aligned to four bytes!');
26342634
#endif
26352635

2636-
#if MIN_WEBGL_VERSION >= 2
2636+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
26372637
#if GL_ASSERTIONS
26382638
assert(GL.currentContext.version >= 2);
26392639
#endif
@@ -2661,7 +2661,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
26612661
var view = {{{ makeHEAPView('F32', 'value', 'value+count*8') }}};
26622662
}
26632663
GLctx.uniform2fv(webglGetUniformLocation(location), view);
2664-
#endif // MIN_WEBGL_VERSION >= 2
2664+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
26652665
},
26662666

26672667
glUniform3fv__deps: ['$webglGetUniformLocation'
@@ -2704,7 +2704,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
27042704
var view = {{{ makeHEAPView('F32', 'value', 'value+count*12') }}};
27052705
}
27062706
GLctx.uniform3fv(webglGetUniformLocation(location), view);
2707-
#endif // MIN_WEBGL_VERSION >= 2
2707+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
27082708
},
27092709

27102710
glUniform4fv__deps: ['$webglGetUniformLocation'
@@ -2718,7 +2718,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
27182718
assert((value & 3) == 0, 'Pointer to float data passed to glUniform4fv must be aligned to four bytes!');
27192719
#endif
27202720

2721-
#if MIN_WEBGL_VERSION >= 2
2721+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
27222722
#if GL_ASSERTIONS
27232723
assert(GL.currentContext.version >= 2);
27242724
#endif
@@ -2752,7 +2752,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
27522752
var view = {{{ makeHEAPView('F32', 'value', 'value+count*16') }}};
27532753
}
27542754
GLctx.uniform4fv(webglGetUniformLocation(location), view);
2755-
#endif // MIN_WEBGL_VERSION >= 2
2755+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
27562756
},
27572757

27582758
glUniformMatrix2fv__deps: ['$webglGetUniformLocation'
@@ -2766,7 +2766,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
27662766
assert((value & 3) == 0, 'Pointer to float data passed to glUniformMatrix2fv must be aligned to four bytes!');
27672767
#endif
27682768

2769-
#if MIN_WEBGL_VERSION >= 2
2769+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
27702770
#if GL_ASSERTIONS
27712771
assert(GL.currentContext.version >= 2);
27722772
#endif
@@ -2796,7 +2796,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
27962796
var view = {{{ makeHEAPView('F32', 'value', 'value+count*16') }}};
27972797
}
27982798
GLctx.uniformMatrix2fv(webglGetUniformLocation(location), !!transpose, view);
2799-
#endif // MIN_WEBGL_VERSION >= 2
2799+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
28002800
},
28012801

28022802
glUniformMatrix3fv__deps: ['$webglGetUniformLocation'
@@ -2810,7 +2810,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
28102810
assert((value & 3) == 0, 'Pointer to float data passed to glUniformMatrix3fv must be aligned to four bytes!');
28112811
#endif
28122812

2813-
#if MIN_WEBGL_VERSION >= 2
2813+
#if MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
28142814
#if GL_ASSERTIONS
28152815
assert(GL.currentContext.version >= 2);
28162816
#endif
@@ -2845,7 +2845,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
28452845
var view = {{{ makeHEAPView('F32', 'value', 'value+count*36') }}};
28462846
}
28472847
GLctx.uniformMatrix3fv(webglGetUniformLocation(location), !!transpose, view);
2848-
#endif // MIN_WEBGL_VERSION >= 2
2848+
#endif // MIN_WEBGL_VERSION >= 2 && WEBGL_USE_GARBAGE_FREE_APIS
28492849
},
28502850

28512851
glUniformMatrix4fv__deps: ['$webglGetUniformLocation'

0 commit comments

Comments
 (0)