Skip to content
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.

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

Remove regal port #21893

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ See docs/process.md for more on how version tagging works.

3.1.60 (in development)
-----------------------
- The regal port was removed since the project seems to be long dead upstream.
Please get in touch if you were depending on this library.
- The `EXPORTED_FUNCTIONS` list can now include JS library symbols even if they
have not been otherwise included (e.g. via `DEFAULT_LIBRARY_FUNCS_TO_INCLUDE`).
(#21867)
Expand Down
10 changes: 0 additions & 10 deletions site/source/docs/tools_reference/settings_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1993,16 +1993,6 @@ Alternate syntax: --use-port=libpng

.. note:: Applicable during both linking and compilation

.. _use_regal:

USE_REGAL
=========

1 = use Regal from emscripten-ports
Alternate syntax: --use-port=regal

.. note:: Applicable during both linking and compilation

.. _use_boost_headers:

USE_BOOST_HEADERS
Expand Down
6 changes: 1 addition & 5 deletions src/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -1540,11 +1540,6 @@ var USE_LIBJPEG = false;
// [compile+link]
var USE_LIBPNG = false;

// 1 = use Regal from emscripten-ports
// Alternate syntax: --use-port=regal
// [compile+link]
var USE_REGAL = false;

// 1 = use Boost headers from emscripten-ports
// Alternate syntax: --use-port=boost_headers
// [compile+link]
Expand Down Expand Up @@ -2235,4 +2230,5 @@ var LEGACY_SETTINGS = [
['MIN_IE_VERSION', [0x7FFFFFFF], 'No longer supported'],
['WORKAROUND_OLD_WEBGL_UNIFORM_UPLOAD_IGNORED_OFFSET_BUG', [0], 'No longer supported'],
['AUTO_ARCHIVE_INDEXES', [0, 1], 'No longer needed'],
['USE_REGAL', [0], 'No longer supported'],
];
24 changes: 0 additions & 24 deletions test/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1521,12 +1521,6 @@ def test_sdl_ogl(self):
self.reftest('test_sdl_ogl.c', 'screenshot-gray-purple.png', reference_slack=1,
args=['-O2', '--minify=0', '--preload-file', 'screenshot.png', '-sLEGACY_GL_EMULATION', '--use-preload-plugins', '-lSDL', '-lGL'])

@requires_graphics_hardware
def test_sdl_ogl_regal(self):
shutil.copyfile(test_file('screenshot.png'), 'screenshot.png')
self.reftest('test_sdl_ogl.c', 'screenshot-gray-purple.png', reference_slack=1,
args=['-O2', '--minify=0', '--preload-file', 'screenshot.png', '-sUSE_REGAL', '-DUSE_REGAL', '--use-preload-plugins', '-lSDL', '-lGL', '-lc++', '-lc++abi'])

@requires_graphics_hardware
def test_sdl_ogl_defaultmatrixmode(self):
shutil.copyfile(test_file('screenshot.png'), 'screenshot.png')
Expand Down Expand Up @@ -2029,11 +2023,6 @@ def test_matrix_identity(self):
def test_cubegeom_pre(self):
self.reftest('third_party/cubegeom/cubegeom_pre.c', 'third_party/cubegeom/cubegeom_pre.png', args=['-sLEGACY_GL_EMULATION', '-lGL', '-lSDL'])

@requires_graphics_hardware
@no_swiftshader
def test_cubegeom_pre_regal(self):
self.reftest('third_party/cubegeom/cubegeom_pre.c', 'third_party/cubegeom/cubegeom_pre.png', args=['-sUSE_REGAL', '-DUSE_REGAL', '-lGL', '-lSDL', '-lc++', '-lc++abi'])

@requires_graphics_hardware
@no_swiftshader
def test_cubegeom_pre_relocatable(self):
Expand Down Expand Up @@ -2062,14 +2051,6 @@ def test_cubegeom(self, args):
# proxied)
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)

@requires_graphics_hardware
def test_cubegeom_regal(self):
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)

@requires_graphics_hardware
def test_cubegeom_regal_mt(self):
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)

@requires_graphics_hardware
@parameterized({
'': ([],),
Expand Down Expand Up @@ -2147,11 +2128,6 @@ def test_cubegeom_fog(self):
def test_cubegeom_pre_vao(self):
self.reftest('third_party/cubegeom/cubegeom_pre_vao.c', 'third_party/cubegeom/cubegeom_pre_vao.png', args=['-sLEGACY_GL_EMULATION', '-lGL', '-lSDL'])

@requires_graphics_hardware
@no_swiftshader
def test_cubegeom_pre_vao_regal(self):
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'])

@requires_graphics_hardware
@no_swiftshader
def test_cubegeom_pre2_vao(self):
Expand Down
130 changes: 0 additions & 130 deletions tools/ports/regal.py

This file was deleted.

Loading