aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-03-31 14:01:33 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-03-31 14:17:29 -0700
commit0ab1802b4d10ba893a9b3c82b92805fad7590dc6 (patch)
tree80b20d91e32eeec8e0ed8d334074df919b42a53e
parentb01c2fe8db794bc5bb32e56459b55deb4057c28c (diff)
GL_UNSAFE_OPTS tweaks
-rw-r--r--src/library_gl.js3
-rwxr-xr-xtests/runner.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index 5c415b85..1d37ca91 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -1222,6 +1222,9 @@ var LibraryGL = {
// Add some emulation workarounds
Module.printErr('WARNING: using emscripten GL emulation. This is a collection of limited workarounds, do not expect it to work');
+#if GL_UNSAFE_OPTS == 0
+ Module.printErr('WARNING: using emscripten GL emulation unsafe opts. If weirdness happens, try -s GL_UNSAFE_OPTS=0');
+#endif
// XXX some of the capabilities we don't support may lead to incorrect rendering, if we do not emulate them in shaders
var validCapabilities = {
diff --git a/tests/runner.py b/tests/runner.py
index 008d4607..2c38882f 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -11529,7 +11529,7 @@ elif 'browser' in str(sys.argv):
def test_gl_ps_strides(self):
shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'screenshot.png'))
- self.btest('gl_ps_strides.c', reference='gl_ps_strides.png', args=['--preload-file', 'screenshot.png'])
+ self.btest('gl_ps_strides.c', reference='gl_ps_strides.png', args=['--preload-file', 'screenshot.png', '-s', 'GL_UNSAFE_OPTS=0'])
def test_gl_renderers(self):
self.btest('gl_renderers.c', reference='gl_renderers.png', args=['-s', 'GL_UNSAFE_OPTS=0'])