Merge branch 'incoming' into asm_js

2 files changed, 26 insertions, 1 deletions

diff --git a/src/library_gl.js b/src/library_gl.js
index 6927c3ec..e9e93b93 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -2100,6 +2100,11 @@ var LibraryGL = {
   },
 
   glColor4f: function(r, g, b, a) {
+    r = Math.max(Math.min(r, 1), 0);
+    g = Math.max(Math.min(g, 1), 0);
+    b = Math.max(Math.min(b, 1), 0);
+    a = Math.max(Math.min(a, 1), 0);
+
     // TODO: make ub the default, not f, save a few mathops
     if (GL.immediate.mode) {
       var start = GL.immediate.vertexCounter << 2;
diff --git a/src/parseTools.js b/src/parseTools.js
index 45d3d862..1ef09f49 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -1410,7 +1410,27 @@ function makePointer(slab, pos, allocator, type, ptr) {
       types = de[0];
     }
   }
-  return 'allocate(' + slab + ', ' + JSON.stringify(types) + (allocator ? ', ' + allocator : '') + (allocator == 'ALLOC_NONE' ? ', ' + ptr : '') + ')';
+  // JS engines sometimes say array initializers are too large. Work around that by chunking and calling concat to combine at runtime
+  var chunkSize = 10240;
+  function chunkify(array) {
+    // break very large slabs into parts
+    var ret = '';
+    var index = 0;
+    while (index < array.length) {
+      ret = (ret ? ret + '.concat(' : '') + '[' + array.slice(index, index + chunkSize).map(JSON.stringify) + ']' + (ret ? ')' : '');
+      index += chunkSize;
+    }
+    return ret;
+  }
+  if (typeof slab == 'string' && evaled && evaled.length > chunkSize) {
+    slab = chunkify(evaled);
+  }
+  if (typeof types != 'string' && types.length > chunkSize) {
+    types = chunkify(types);
+  } else {
+    types = JSON.stringify(types);
+  }
+  return 'allocate(' + slab + ', ' + types + (allocator ? ', ' + allocator : '') + (allocator == 'ALLOC_NONE' ? ', ' + ptr : '') + ')';
 }
 
 function makeGetSlabs(ptr, type, allowMultiple, unsigned) {