@@ -1286,6 +1286,7 @@ def test_glfw_joystick(self):
12861286 self .btest_exit ('test_glfw_joystick.c' , args = ['-O2' , '--minify=0' , '-o' , 'page.html' , '--pre-js' , 'pre.js' , '-lGL' , '-lglfw3' , '-sUSE_GLFW=3' ])
12871287
12881288 @requires_graphics_hardware
1289+
12891290 def test_webgl_context_attributes (self ):
12901291 # Javascript code to check the attributes support we want to test in the WebGL implementation
12911292 # (request the attribute, create a context and check its value afterwards in the context attributes).
@@ -1330,7 +1331,8 @@ def test_webgl_context_attributes(self):
13301331 # perform tests with attributes activated
13311332 self .btest_exit ('test_webgl_context_attributes_glut.c' , args = ['--js-library' , 'check_webgl_attributes_support.js' , '-DAA_ACTIVATED' , '-DDEPTH_ACTIVATED' , '-DSTENCIL_ACTIVATED' , '-DALPHA_ACTIVATED' , '-lGL' , '-lglut' , '-lGLEW' ])
13321333 self .btest_exit ('test_webgl_context_attributes_sdl.c' , args = ['--js-library' , 'check_webgl_attributes_support.js' , '-DAA_ACTIVATED' , '-DDEPTH_ACTIVATED' , '-DSTENCIL_ACTIVATED' , '-DALPHA_ACTIVATED' , '-lGL' , '-lSDL' , '-lGLEW' ])
1333- self .btest_exit ('test_webgl_context_attributes_sdl2.c' , args = ['--js-library' , 'check_webgl_attributes_support.js' , '-DAA_ACTIVATED' , '-DDEPTH_ACTIVATED' , '-DSTENCIL_ACTIVATED' , '-DALPHA_ACTIVATED' , '-lGL' , '-sUSE_SDL=2' , '-lGLEW' ])
1334+ if not self .is_wasm64 ():
1335+ self .btest_exit ('test_webgl_context_attributes_sdl2.c' , args = ['--js-library' , 'check_webgl_attributes_support.js' , '-DAA_ACTIVATED' , '-DDEPTH_ACTIVATED' , '-DSTENCIL_ACTIVATED' , '-DALPHA_ACTIVATED' , '-lGL' , '-sUSE_SDL=2' , '-lGLEW' ])
13341336 self .btest_exit ('test_webgl_context_attributes_glfw.c' , args = ['--js-library' , 'check_webgl_attributes_support.js' , '-DAA_ACTIVATED' , '-DDEPTH_ACTIVATED' , '-DSTENCIL_ACTIVATED' , '-DALPHA_ACTIVATED' , '-lGL' , '-lglfw' , '-lGLEW' ])
13351337
13361338 # perform tests with attributes desactivated
@@ -2749,14 +2751,15 @@ def test_webgl_unmasked_vendor_webgl(self):
27492751 self .btest_exit ('webgl_unmasked_vendor_webgl.c' , args = ['-lGL' ])
27502752
27512753 @requires_graphics_hardware
2752- def test_webgl2 (self ):
2753- for opts in [
2754- ['-sMIN_CHROME_VERSION=0' , '-Wno-transpile' ],
2755- ['-O2' , '-g1' , '--closure=1' , '-sWORKAROUND_OLD_WEBGL_UNIFORM_UPLOAD_IGNORED_OFFSET_BUG' ],
2756- ['-sFULL_ES2' ],
2757- ]:
2758- print (opts )
2759- self .btest_exit ('webgl2.cpp' , args = ['-sMAX_WEBGL_VERSION=2' , '-lGL' ] + opts )
2754+ @parameterized ({
2755+ 'legacy_browser' : (['-sMIN_CHROME_VERSION=0' , '-Wno-transpile' ],),
2756+ 'closure' : (['-O2' , '-g1' , '--closure=1' , '-sWORKAROUND_OLD_WEBGL_UNIFORM_UPLOAD_IGNORED_OFFSET_BUG' ],),
2757+ 'full_es2' : (['-sFULL_ES2' ],),
2758+ })
2759+ def test_webgl2 (self , args ):
2760+ if '-sMIN_CHROME_VERSION=0' in args and self .is_wasm64 ():
2761+ self .skipTest ('wasm64 not supported by legacy browsers' )
2762+ self .btest_exit ('webgl2.cpp' , args = ['-sMAX_WEBGL_VERSION=2' , '-lGL' ] + args )
27602763
27612764 # Tests the WebGL 2 glGetBufferSubData() functionality.
27622765 @requires_graphics_hardware
@@ -4502,6 +4505,7 @@ def test_small_js_flags(self):
45024505 @requires_threads
45034506 @requires_offscreen_canvas
45044507 @requires_graphics_hardware
4508+ @no_wasm64 ('TODO: wasm64 + OFFSCREENCANVAS' )
45054509 def test_webgl_offscreen_canvas_in_pthread (self , args ):
45064510 self .btest ('gl_in_pthread.cpp' , expected = '1' , args = args + ['-pthread' , '-sPTHREAD_POOL_SIZE=2' , '-sOFFSCREENCANVAS_SUPPORT' , '-lGL' ])
45074511
@@ -4521,6 +4525,7 @@ def test_webgl_offscreen_canvas_in_mainthread_after_pthread(self, args):
45214525 @requires_threads
45224526 @requires_offscreen_canvas
45234527 @requires_graphics_hardware
4528+ @no_wasm64 ('TODO: wasm64 + OFFSCREENCANVAS' )
45244529 def test_webgl_offscreen_canvas_only_in_pthread (self ):
45254530 self .btest_exit ('gl_only_in_pthread.cpp' , args = ['-pthread' , '-sPTHREAD_POOL_SIZE' , '-sOFFSCREENCANVAS_SUPPORT' , '-lGL' , '-sOFFSCREEN_FRAMEBUFFER' ])
45264531
@@ -4533,15 +4538,16 @@ def test_webgl_from_client_side_memory_without_default_enabled_extensions(self):
45334538 # For testing WebGL draft extensions like this, if using chrome as the browser,
45344539 # We might want to append the --enable-webgl-draft-extensions to the EMTEST_BROWSER env arg.
45354540 @requires_graphics_hardware
4536- def test_webgl_multi_draw (self ):
4537- self .btest ('webgl_multi_draw_test.c' , reference = 'browser/webgl_multi_draw.png' ,
4538- args = ['-lGL' , '-sOFFSCREEN_FRAMEBUFFER' , '-DMULTI_DRAW_ARRAYS=1' , '-DEXPLICIT_SWAP=1' ])
4539- self .btest ('webgl_multi_draw_test.c' , reference = 'browser/webgl_multi_draw.png' ,
4540- args = ['-lGL' , '-sOFFSCREEN_FRAMEBUFFER' , '-DMULTI_DRAW_ARRAYS_INSTANCED=1' , '-DEXPLICIT_SWAP=1' ])
4541- self .btest ('webgl_multi_draw_test.c' , reference = 'browser/webgl_multi_draw.png' ,
4542- args = ['-lGL' , '-sOFFSCREEN_FRAMEBUFFER' , '-DMULTI_DRAW_ELEMENTS=1' , '-DEXPLICIT_SWAP=1' ])
4543- self .btest ('webgl_multi_draw_test.c' , reference = 'browser/webgl_multi_draw.png' ,
4544- args = ['-lGL' , '-sOFFSCREEN_FRAMEBUFFER' , '-DMULTI_DRAW_ELEMENTS_INSTANCED=1' , '-DEXPLICIT_SWAP=1' ])
4541+ @parameterized ({
4542+ 'arrays' : (['-DMULTI_DRAW_ARRAYS' ],),
4543+ 'arrays_instanced' : (['-DMULTI_DRAW_ARRAYS_INSTANCED' ],),
4544+ 'elements' : (['-DMULTI_DRAW_ELEMENTS' ],),
4545+ 'elements_instanced' : (['-DMULTI_DRAW_ELEMENTS_INSTANCED' ],),
4546+ })
4547+ def test_webgl_multi_draw (self , args ):
4548+ self .btest ('webgl_multi_draw_test.c' ,
4549+ reference = 'browser/webgl_multi_draw.png' ,
4550+ args = ['-lGL' , '-sOFFSCREEN_FRAMEBUFFER' , '-DEXPLICIT_SWAP' ] + args )
45454551
45464552 # Tests for base_vertex/base_instance extension
45474553 # For testing WebGL draft extensions like this, if using chrome as the browser,
@@ -4580,6 +4586,7 @@ def test_webgl_timer_query(self, args):
45804586
45814587 # Tests that -sOFFSCREEN_FRAMEBUFFER rendering works.
45824588 @requires_graphics_hardware
4589+ @no_wasm64 ('TODO: wasm64 + OFB' )
45834590 def test_webgl_offscreen_framebuffer (self ):
45844591 # Tests all the different possible versions of libgl
45854592 for threads in [[], ['-pthread' , '-sPROXY_TO_PTHREAD' ]]:
@@ -4632,6 +4639,7 @@ def test_webgl_array_of_structs_uniform(self):
46324639 @requires_threads
46334640 @requires_offscreen_canvas
46344641 @requires_graphics_hardware
4642+ @no_wasm64 ('TODO: wasm64 + OFFSCREENCANVAS' )
46354643 def test_webgl_offscreen_canvas_in_proxied_pthread (self , asyncify ):
46364644 cmd = ['-pthread' , '-sOFFSCREENCANVAS_SUPPORT' , '-lGL' , '-sGL_DEBUG' , '-sPROXY_TO_PTHREAD' ]
46374645 if asyncify :
@@ -4648,6 +4656,7 @@ def test_webgl_offscreen_canvas_in_proxied_pthread(self, asyncify):
46484656 @requires_threads
46494657 @requires_graphics_hardware
46504658 @requires_offscreen_canvas
4659+ @no_wasm64 ('TODO: wasm64 + OFFSCREENCANVAS' )
46514660 def test_webgl_resize_offscreencanvas_from_main_thread (self , args ):
46524661 for args2 in [[], ['-DTEST_SYNC_BLOCKING_LOOP=1' ]]:
46534662 for args3 in [[], ['-sOFFSCREENCANVAS_SUPPORT' , '-sOFFSCREEN_FRAMEBUFFER' ]]:
0 commit comments