Skip to content

Commit 26e28b0

Browse files
committed
Remove regal port
The regal project seems like its been dead for many years and the repo from which it was forked doesn't seem to exist anymore: https://github.com/p3/regal I'm not sure we want to continue supporting it as first class thing if there is nobody upstream to report issues to. If it turns out that there are folks who really depend on this we can consider moving it into `tools/ports/conrib`. See emscripten-core#21885
1 parent fa80cf2 commit 26e28b0

File tree

5 files changed

+3
-169
lines changed

5 files changed

+3
-169
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ See docs/process.md for more on how version tagging works.
2020

2121
3.1.60 (in development)
2222
-----------------------
23+
- The regal port was removed since the project seems to be long dead upstream.
24+
Please get in touch if you were depending on this library.
2325
- The `EXPORTED_FUNCTIONS` list can now include JS library symbols even if they
2426
have not been otherwise included (e.g. via `DEFAULT_LIBRARY_FUNCS_TO_INCLUDE`).
2527
(#21867)

site/source/docs/tools_reference/settings_reference.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1993,16 +1993,6 @@ Alternate syntax: --use-port=libpng
19931993

19941994
.. note:: Applicable during both linking and compilation
19951995

1996-
.. _use_regal:
1997-
1998-
USE_REGAL
1999-
=========
2000-
2001-
1 = use Regal from emscripten-ports
2002-
Alternate syntax: --use-port=regal
2003-
2004-
.. note:: Applicable during both linking and compilation
2005-
20061996
.. _use_boost_headers:
20071997

20081998
USE_BOOST_HEADERS

src/settings.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,11 +1540,6 @@ var USE_LIBJPEG = false;
15401540
// [compile+link]
15411541
var USE_LIBPNG = false;
15421542

1543-
// 1 = use Regal from emscripten-ports
1544-
// Alternate syntax: --use-port=regal
1545-
// [compile+link]
1546-
var USE_REGAL = false;
1547-
15481543
// 1 = use Boost headers from emscripten-ports
15491544
// Alternate syntax: --use-port=boost_headers
15501545
// [compile+link]
@@ -2235,4 +2230,5 @@ var LEGACY_SETTINGS = [
22352230
['MIN_IE_VERSION', [0x7FFFFFFF], 'No longer supported'],
22362231
['WORKAROUND_OLD_WEBGL_UNIFORM_UPLOAD_IGNORED_OFFSET_BUG', [0], 'No longer supported'],
22372232
['AUTO_ARCHIVE_INDEXES', [0, 1], 'No longer needed'],
2233+
['USE_REGAL', [0], 'No longer supported'],
22382234
];

test/test_browser.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,12 +1521,6 @@ def test_sdl_ogl(self):
15211521
self.reftest('test_sdl_ogl.c', 'screenshot-gray-purple.png', reference_slack=1,
15221522
args=['-O2', '--minify=0', '--preload-file', 'screenshot.png', '-sLEGACY_GL_EMULATION', '--use-preload-plugins', '-lSDL', '-lGL'])
15231523

1524-
@requires_graphics_hardware
1525-
def test_sdl_ogl_regal(self):
1526-
shutil.copyfile(test_file('screenshot.png'), 'screenshot.png')
1527-
self.reftest('test_sdl_ogl.c', 'screenshot-gray-purple.png', reference_slack=1,
1528-
args=['-O2', '--minify=0', '--preload-file', 'screenshot.png', '-sUSE_REGAL', '-DUSE_REGAL', '--use-preload-plugins', '-lSDL', '-lGL', '-lc++', '-lc++abi'])
1529-
15301524
@requires_graphics_hardware
15311525
def test_sdl_ogl_defaultmatrixmode(self):
15321526
shutil.copyfile(test_file('screenshot.png'), 'screenshot.png')
@@ -2029,11 +2023,6 @@ def test_matrix_identity(self):
20292023
def test_cubegeom_pre(self):
20302024
self.reftest('third_party/cubegeom/cubegeom_pre.c', 'third_party/cubegeom/cubegeom_pre.png', args=['-sLEGACY_GL_EMULATION', '-lGL', '-lSDL'])
20312025

2032-
@requires_graphics_hardware
2033-
@no_swiftshader
2034-
def test_cubegeom_pre_regal(self):
2035-
self.reftest('third_party/cubegeom/cubegeom_pre.c', 'third_party/cubegeom/cubegeom_pre.png', args=['-sUSE_REGAL', '-DUSE_REGAL', '-lGL', '-lSDL', '-lc++', '-lc++abi'])
2036-
20372026
@requires_graphics_hardware
20382027
@no_swiftshader
20392028
def test_cubegeom_pre_relocatable(self):
@@ -2062,14 +2051,6 @@ def test_cubegeom(self, args):
20622051
# proxied)
20632052
self.reftest('third_party/cubegeom/cubegeom.c', 'third_party/cubegeom/cubegeom.png', args=['-O2', '-g', '-sLEGACY_GL_EMULATION', '-lGL', '-lSDL'] + args, also_proxied=not args)
20642053

2065-
@requires_graphics_hardware
2066-
def test_cubegeom_regal(self):
2067-
self.reftest('third_party/cubegeom/cubegeom.c', 'third_party/cubegeom/cubegeom.png', args=['-O2', '-g', '-DUSE_REGAL', '-sUSE_REGAL', '-lGL', '-lSDL', '-lc++', '-lc++abi'], also_proxied=True)
2068-
2069-
@requires_graphics_hardware
2070-
def test_cubegeom_regal_mt(self):
2071-
self.reftest('third_party/cubegeom/cubegeom.c', 'third_party/cubegeom/cubegeom.png', args=['-O2', '-g', '-pthread', '-DUSE_REGAL', '-pthread', '-sUSE_REGAL', '-lGL', '-lSDL', '-lc++', '-lc++abi'], also_proxied=False)
2072-
20732054
@requires_graphics_hardware
20742055
@parameterized({
20752056
'': ([],),
@@ -2147,11 +2128,6 @@ def test_cubegeom_fog(self):
21472128
def test_cubegeom_pre_vao(self):
21482129
self.reftest('third_party/cubegeom/cubegeom_pre_vao.c', 'third_party/cubegeom/cubegeom_pre_vao.png', args=['-sLEGACY_GL_EMULATION', '-lGL', '-lSDL'])
21492130

2150-
@requires_graphics_hardware
2151-
@no_swiftshader
2152-
def test_cubegeom_pre_vao_regal(self):
2153-
self.reftest('third_party/cubegeom/cubegeom_pre_vao.c', 'third_party/cubegeom/cubegeom_pre_vao.png', args=['-sUSE_REGAL', '-DUSE_REGAL', '-lGL', '-lSDL', '-lc++', '-lc++abi'])
2154-
21552131
@requires_graphics_hardware
21562132
@no_swiftshader
21572133
def test_cubegeom_pre2_vao(self):

tools/ports/regal.py

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
 (0)