Merge pull request #219 from ehsan/mandatory_typed_arrays_2

Disable WebGL if typed arrays are not being used.

2 files changed, 10 insertions, 0 deletions

diff --git a/src/library_gl.js b/src/library_gl.js
index e1a7c73b..5cb30299 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -513,6 +513,7 @@ var LibraryGLUT = {
   },
 
   glutCreateWindow: function(name) {
+#if USE_TYPED_ARRAYS
     try {
       var ctx = Module.canvas.getContext('experimental-webgl');
       if (!ctx) throw 'Could not create canvas :(';
@@ -523,6 +524,9 @@ var LibraryGLUT = {
     } catch (e) {
       Module.print('(canvas not available)');
     }
+#else
+    Module.print('(USE_TYPED_ARRAYS needs to be enabled for WebGL)');
+#endif
   },
 
   glutInitDisplayMode: function(mode) {},
diff --git a/src/library_sdl.js b/src/library_sdl.js
index 35c619b8..7b413c13 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -173,6 +173,12 @@ mergeInto(LibraryManager.library, {
     },
 
     createContext: function(useWebGL) {
+#if !USE_TYPED_ARRAYS
+      if (useWebGL) {
+	Module.print('(USE_TYPED_ARRAYS needs to be enabled for WebGL)');
+        return null;
+      }
+#endif
       try {
         var ctx = Module.canvas.getContext(useWebGL ? 'experimental-webgl' : '2d');
         if (!ctx) throw 'Could not create canvas :(';