Skip to content

Add env. var. EMTEST_LACKS_WEBGL2. #25266

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add env. var. EMTEST_LACKS_WEBGL2. #25266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 37 additions & 14 deletions test/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,17 @@ def decorated(self, *args, **kwargs):
return decorator


def webgl2_disabled():
return os.getenv('EMTEST_LACKS_WEBGL2') or os.getenv('EMTEST_LACKS_GRAPHICS_HARDWARE')


def webgpu_disabled():
return os.getenv('EMTEST_LACKS_WEBGPU') or os.getenv('EMTEST_LACKS_GRAPHICS_HARDWARE')


requires_graphics_hardware = skipExecIf(os.getenv('EMTEST_LACKS_GRAPHICS_HARDWARE'), 'This test requires graphics hardware')
requires_webgpu = unittest.skipIf(os.getenv('EMTEST_LACKS_WEBGPU'), "This test requires WebGPU to be available")
requires_webgl2 = unittest.skipIf(webgl2_disabled(), "This test requires WebGL2 to be available")
requires_webgpu = unittest.skipIf(webgpu_disabled(), "This test requires WebGPU to be available")
requires_sound_hardware = skipExecIf(os.getenv('EMTEST_LACKS_SOUND_HARDWARE'), 'This test requires sound hardware')
requires_offscreen_canvas = skipExecIf(os.getenv('EMTEST_LACKS_OFFSCREEN_CANVAS'), 'This test requires a browser with OffscreenCanvas')

Expand Down Expand Up @@ -1251,15 +1260,15 @@ def test_webgl_no_double_error(self):
def test_webgl_parallel_shader_compile(self):
self.btest_exit('webgl_parallel_shader_compile.cpp')

@requires_graphics_hardware
@requires_webgl2
def test_webgl_explicit_uniform_location(self):
self.btest_exit('webgl_explicit_uniform_location.c', cflags=['-sGL_EXPLICIT_UNIFORM_LOCATION', '-sMIN_WEBGL_VERSION=2'])

@requires_graphics_hardware
def test_webgl_sampler_layout_binding(self):
self.btest_exit('webgl_sampler_layout_binding.c', cflags=['-sGL_EXPLICIT_UNIFORM_BINDING'])

@requires_graphics_hardware
@requires_webgl2
def test_webgl2_ubo_layout_binding(self):
self.btest_exit('webgl2_ubo_layout_binding.c', cflags=['-sGL_EXPLICIT_UNIFORM_BINDING', '-sMIN_WEBGL_VERSION=2'])

Expand Down Expand Up @@ -1799,7 +1808,7 @@ def test_gles2_emulation(self, args):
'-lGL', '-lEGL', '-lX11', '-Wno-int-conversion', '-Wno-pointer-sign',
'--preload-file', 'basemap.tga', '--preload-file', 'lightmap.tga', '--preload-file', 'smoke.tga'] + args)

@requires_graphics_hardware
@requires_webgl2
def test_clientside_vertex_arrays_es3(self):
self.reftest('clientside_vertex_arrays_es3.c', 'gl_triangle.png', cflags=['-sFULL_ES3', '-sUSE_GLFW=3', '-lglfw', '-lGLESv2'])

Expand Down Expand Up @@ -2133,7 +2142,7 @@ def test_cubegeom_pre2_vao2(self):
def test_cubegeom_pre_vao_es(self):
self.reftest('third_party/cubegeom/cubegeom_pre_vao_es.c', 'third_party/cubegeom/cubegeom_pre_vao.png', cflags=['-sFULL_ES2', '-lGL', '-lSDL'])

@requires_graphics_hardware
@requires_webgl2
@no_swiftshader
def test_cubegeom_row_length(self):
self.reftest('third_party/cubegeom/cubegeom_pre_vao_es.c', 'third_party/cubegeom/cubegeom_pre_vao.png', cflags=['-sFULL_ES2', '-lGL', '-lSDL', '-DUSE_UNPACK_ROW_LENGTH', '-sMIN_WEBGL_VERSION=2'])
Expand Down Expand Up @@ -2251,6 +2260,8 @@ def test_float_tex(self):
'es2_tracing': (['-sMIN_WEBGL_VERSION=2', '-sFULL_ES2', '-sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION', '-sTRACE_WEBGL_CALLS'],),
})
def test_subdata(self, args):
if '-sMIN_WEBGL_VERSION=2' in args and webgl2_disabled():
self.skipTest('This test requires WebGL2 to be available')
if self.is_4gb() and '-sMIN_WEBGL_VERSION=2' in args:
self.skipTest('texSubImage2D fails: https://crbug.com/325090165')
self.reftest('gl_subdata.c', 'float_tex.png', cflags=['-lGL', '-lglut'] + args)
Expand Down Expand Up @@ -2679,7 +2690,7 @@ def test_webgl2(self, args):
self.btest_exit('webgl2.c', cflags=['-sMAX_WEBGL_VERSION=2', '-lGL'] + args)

# Tests the WebGL 2 glGetBufferSubData() functionality.
@requires_graphics_hardware
@requires_webgl2
@no_4gb('getBufferSubData fails: https://crbug.com/325090165')
def test_webgl2_get_buffer_sub_data(self):
self.btest_exit('webgl2_get_buffer_sub_data.c', cflags=['-sMAX_WEBGL_VERSION=2', '-lGL'])
Expand All @@ -2694,11 +2705,11 @@ def test_webgl2_pthreads(self):
def test_webgl2_objects(self):
self.btest_exit('webgl2_objects.c', cflags=['-sMAX_WEBGL_VERSION=2', '-lGL'])

@requires_graphics_hardware
@requires_webgl2
@parameterized({
'': ([],),
'offscreencanvas': (['-sOFFSCREENCANVAS_SUPPORT', '-pthread', '-sPROXY_TO_PTHREAD'],),
'offscreenframbuffer': (['-sOFFSCREEN_FRAMEBUFFER', '-pthread', '-sPROXY_TO_PTHREAD'],),
'offscreenframebuffer': (['-sOFFSCREEN_FRAMEBUFFER', '-pthread', '-sPROXY_TO_PTHREAD'],),
})
def test_html5_webgl_api(self, args):
if '-sOFFSCREENCANVAS_SUPPORT' in args and os.getenv('EMTEST_LACKS_OFFSCREEN_CANVAS'):
Expand All @@ -2713,6 +2724,8 @@ def test_html5_webgl_api(self, args):
})
@requires_graphics_hardware
def test_webgl_preprocessor_variables(self, opts):
if '-DWEBGL_VERSION=2' in opts and webgl2_disabled():
self.skipTest('This test requires WebGL2 to be available')
self.btest_exit('webgl_preprocessor_variables.c', cflags=['-lGL'] + opts)

@requires_graphics_hardware
Expand All @@ -2725,11 +2738,13 @@ def test_webgl2_ubos(self):
'webgl2': (['-sMAX_WEBGL_VERSION=2', '-DTEST_WEBGL2=1'],),
})
def test_webgl2_garbage_free_entrypoints(self, args):
if '-DTEST_WEBGL2=1' in args and webgl2_disabled():
self.skipTest('This test requires WebGL2 to be available')
if args and self.is_4gb():
self.skipTest('readPixels fails: https://crbug.com/324992397')
self.btest_exit('webgl2_garbage_free_entrypoints.c', cflags=args)

@requires_graphics_hardware
@requires_webgl2
def test_webgl2_backwards_compatibility_emulation(self):
self.btest_exit('webgl2_backwards_compatibility_emulation.c', cflags=['-sMAX_WEBGL_VERSION=2', '-sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION'])

Expand All @@ -2752,13 +2767,16 @@ def test_webgl_context_major_version(self):

# -sMIN_WEBGL_VERSION=2 => only 2 allowed
self.btest('test_webgl_context_major_version.c', expected='abort:Expected Error: WebGL 1 requested but only WebGL 2 is supported (MIN_WEBGL_VERSION is 2)', cflags=['-lGL', '-sMIN_WEBGL_VERSION=2', '-DWEBGL_CONTEXT_MAJOR_VERSION=1'])

@requires_webgl2
def test_webgl_context_major_version_webgl2(self):
self.btest_exit('test_webgl_context_major_version.c', cflags=['-lGL', '-sMIN_WEBGL_VERSION=2', '-DWEBGL_CONTEXT_MAJOR_VERSION=2'])

# -sMAX_WEBGL_VERSION=2 => 1 and 2 are ok
self.btest_exit('test_webgl_context_major_version.c', cflags=['-lGL', '-sMAX_WEBGL_VERSION=2', '-DWEBGL_CONTEXT_MAJOR_VERSION=1'])
self.btest_exit('test_webgl_context_major_version.c', cflags=['-lGL', '-sMAX_WEBGL_VERSION=2', '-DWEBGL_CONTEXT_MAJOR_VERSION=2'])

@requires_graphics_hardware
@requires_webgl2
def test_webgl2_invalid_teximage2d_type(self):
self.btest_exit('webgl2_invalid_teximage2d_type.c', cflags=['-sMAX_WEBGL_VERSION=2'])

Expand All @@ -2767,7 +2785,7 @@ def test_webgl_with_closure(self):
self.btest_exit('webgl_with_closure.c', cflags=['-O2', '-sMAX_WEBGL_VERSION=2', '--closure=1', '-lGL'])

# Tests that -sGL_ASSERTIONS and glVertexAttribPointer with packed types works
@requires_graphics_hardware
@requires_webgl2
def test_webgl2_packed_types(self):
self.btest_exit('webgl2_draw_packed_triangle.c', cflags=['-lGL', '-sMAX_WEBGL_VERSION=2', '-sGL_ASSERTIONS'])

Expand All @@ -2789,7 +2807,7 @@ def test_webgl2_sokol_mrt(self):
self.reftest('third_party/sokol/mrt-emcc.c', 'third_party/sokol/mrt-emcc.png',
cflags=['-sMAX_WEBGL_VERSION=2', '-lGL'])

@requires_graphics_hardware
@requires_webgl2
@no_4gb('fails to render')
def test_webgl2_sokol_arraytex(self):
self.reftest('third_party/sokol/arraytex-emsc.c', 'third_party/sokol/arraytex-emsc.png',
Expand Down Expand Up @@ -4274,7 +4292,7 @@ def test_webgl_multi_draw(self, args):
# We might want to append the --enable-webgl-draft-extensions to the EMTEST_BROWSER env arg.
# If testing on Mac, you also need --use-cmd-decoder=passthrough to get this extension.
# Also there is a known bug with Mac Intel baseInstance which can fail producing the expected image result.
@requires_graphics_hardware
@requires_webgl2
@parameterized({
'': (0,),
'multidraw': (1,),
Expand Down Expand Up @@ -4346,6 +4364,8 @@ def test_webgl_vao_without_automatic_extensions(self):
'gl2_no_aa': (['-sMAX_WEBGL_VERSION=2', '-DTEST_WEBGL2=1', '-DTEST_ANTIALIAS=0'],),
})
def test_webgl_offscreen_framebuffer_state_restoration(self, args):
if '-DTEST_WEBGL2=1' in args and webgl2_disabled():
self.skipTest('This test requires WebGL2 to be available')
base_args = ['-lGL', '-sOFFSCREEN_FRAMEBUFFER', '-DEXPLICIT_SWAP=1']
self.btest_exit('webgl_offscreen_framebuffer_swap_with_bad_state.c', cflags=base_args + args)

Expand All @@ -4359,7 +4379,7 @@ def test_webgl_draw_triangle_with_uniform_color(self, args):
self.btest_exit('webgl_draw_triangle_with_uniform_color.c', cflags=args)

# Tests that using an array of structs in GL uniforms works.
@requires_graphics_hardware
@requires_webgl2
def test_webgl_array_of_structs_uniform(self):
self.reftest('webgl_array_of_structs_uniform.c', 'webgl_array_of_structs_uniform.png', cflags=['-lGL', '-sMAX_WEBGL_VERSION=2'])

Expand Down Expand Up @@ -4416,6 +4436,9 @@ def test_webgl_resize_offscreencanvas_from_main_thread(self, args1, args2, args3
'disable': (0,),
})
def test_webgl_simple_extensions(self, webgl_version, simple_enable_extensions):
if webgl_version == 2 and webgl2_disabled():
self.skipTest('This test requires WebGL2 to be available')

cmd = ['-DWEBGL_CONTEXT_VERSION=' + str(webgl_version),
'-DWEBGL_SIMPLE_ENABLE_EXTENSION=' + str(simple_enable_extensions),
'-sMAX_WEBGL_VERSION=2',
Expand Down