Browser fixes

lib/buffer.js

@@ -268,7 +268,8 @@ module.exports = function wrapBufferState (gl, stats, config, attributeState) {
 
       buffer.bind()
       if (!data) {
-        gl.bufferData(buffer.type, byteLength, usage)
+        // #475
+        if (byteLength) gl.bufferData(buffer.type, byteLength, usage)
         buffer.dtype = dtype || GL_UNSIGNED_BYTE
         buffer.usage = usage
         buffer.dimension = dimension

lib/texture.js

@@ -827,6 +827,7 @@ module.exports = function createTextureSet (
     var type = info.type
     var width = info.width
     var height = info.height
+    var channels = info.channels
 
     setFlags(info)
 
@@ -839,8 +840,14 @@ module.exports = function createTextureSet (
       gl.copyTexImage2D(
         target, miplevel, format, info.xOffset, info.yOffset, width, height, 0)
     } else {
-      gl.texImage2D(
-        target, miplevel, format, width, height, 0, format, type, data)
+      var nullData = !data
+      if (nullData) data = pool.zero.allocType(type, width * height * channels)
+
+      gl.texImage2D(target, miplevel, format, width, height, 0, format, type, data)
+
+      if (nullData && data) {
+        pool.zero.freeType(data)
+      }
     }
   }
 
@@ -1325,12 +1332,15 @@ module.exports = function createTextureSet (
 
       tempBind(texture)
       for (var i = 0; texture.mipmask >> i; ++i) {
+        var _w = w >> i
+        var _h = h >> i
+        if (!_w || !_h) break
         gl.texImage2D(
           GL_TEXTURE_2D,
           i,
           texture.format,
-          w >> i,
-          h >> i,
+          _w,
+          _h,
           0,
           texture.format,
           texture.type,

lib/util/pool.js

@@ -7,10 +7,7 @@ var GL_UNSIGNED_SHORT = 5123
 var GL_INT = 5124
 var GL_UNSIGNED_INT = 5125
 var GL_FLOAT = 5126
-
-var bufferPool = loop(8, function () {
-  return []
-})
+var GL_HALF_FLOAT = 36193
 
 function nextPow16 (v) {
   for (var i = 16; i <= (1 << 28); i *= 16) {
@@ -34,59 +31,71 @@ function log2 (v) {
   return r | (v >> 1)
 }
 
-function alloc (n) {
-  var sz = nextPow16(n)
-  var bin = bufferPool[log2(sz) >> 2]
-  if (bin.length > 0) {
-    return bin.pop()
+function createPool () {
+  var bufferPool = loop(8, function () {
+    return []
+  })
+
+  function alloc (n) {
+    var sz = nextPow16(n)
+    var bin = bufferPool[log2(sz) >> 2]
+    if (bin.length > 0) {
+      return bin.pop()
+    }
+    return new ArrayBuffer(sz)
   }
-  return new ArrayBuffer(sz)
-}
 
-function free (buf) {
-  bufferPool[log2(buf.byteLength) >> 2].push(buf)
-}
+  function free (buf) {
+    bufferPool[log2(buf.byteLength) >> 2].push(buf)
+  }
 
-function allocType (type, n) {
-  var result = null
-  switch (type) {
-    case GL_BYTE:
-      result = new Int8Array(alloc(n), 0, n)
-      break
-    case GL_UNSIGNED_BYTE:
-      result = new Uint8Array(alloc(n), 0, n)
-      break
-    case GL_SHORT:
-      result = new Int16Array(alloc(2 * n), 0, n)
-      break
-    case GL_UNSIGNED_SHORT:
-      result = new Uint16Array(alloc(2 * n), 0, n)
-      break
-    case GL_INT:
-      result = new Int32Array(alloc(4 * n), 0, n)
-      break
-    case GL_UNSIGNED_INT:
-      result = new Uint32Array(alloc(4 * n), 0, n)
-      break
-    case GL_FLOAT:
-      result = new Float32Array(alloc(4 * n), 0, n)
-      break
-    default:
-      return null
+  function allocType (type, n) {
+    var result = null
+    switch (type) {
+      case GL_BYTE:
+        result = new Int8Array(alloc(n), 0, n)
+        break
+      case GL_UNSIGNED_BYTE:
+        result = new Uint8Array(alloc(n), 0, n)
+        break
+      case GL_SHORT:
+        result = new Int16Array(alloc(2 * n), 0, n)
+        break
+      case GL_UNSIGNED_SHORT:
+      case GL_HALF_FLOAT:
+        result = new Uint16Array(alloc(2 * n), 0, n)
+        break
+      case GL_INT:
+        result = new Int32Array(alloc(4 * n), 0, n)
+        break
+      case GL_UNSIGNED_INT:
+        result = new Uint32Array(alloc(4 * n), 0, n)
+        break
+      case GL_FLOAT:
+        result = new Float32Array(alloc(4 * n), 0, n)
+        break
+      default:
+        return null
+    }
+    if (result.length !== n) {
+      return result.subarray(0, n)
+    }
+    return result
   }
-  if (result.length !== n) {
-    return result.subarray(0, n)
+
+  function freeType (array) {
+    free(array.buffer)
   }
-  return result
-}
 
-function freeType (array) {
-  free(array.buffer)
+  return {
+    alloc: alloc,
+    free: free,
+    allocType: allocType,
+    freeType: freeType
+  }
 }
 
-module.exports = {
-  alloc: alloc,
-  free: free,
-  allocType: allocType,
-  freeType: freeType
-}
+module.exports = createPool()
+
+// zero pool for initial zero data
+module.exports.zero = createPool()

test/attributes-nested.js

@@ -46,8 +46,8 @@ tape('attributes nested', function (t) {
 
   function checkPixels (expected) {
     var actual = regl.read()
-    console.log('actual: ', actual)
-    console.log('expected: ', expected)
+    // console.log('actual: ', actual)
+    // console.log('expected: ', expected)
     for (var i = 0; i < 5 * 5; ++i) {
       if (!!actual[4 * i] !== !!expected[i]) {
         console.log('fail at: ', i)

test/elements.js

@@ -173,13 +173,12 @@ tape('elements', function (t) {
       t.ok('destroy successful')
     }
   ]
-
   var poll = setInterval(function () {
     if (cases.length === 0) {
       clearInterval(poll)
       t.end()
     } else {
       (cases.shift())()
     }
-  })
+  }, 0)
 })

test/texture2d.js

@@ -162,7 +162,8 @@ tape('texture 2d', function (t) {
 
       var actual = regl.read()
       for (i = 0; i < expected.length; ++i) {
-        if (!(Math.abs(actual[i] - expected[i]) <= tolerance)) {
+        // ignore null pixels as insignificant
+        if (expected[i] !== null && !(Math.abs(actual[i] - expected[i]) <= tolerance)) {
           t.fail(name + ' @ index ' + i + ' ' + expected[i] + ' - ' + actual[i])
           return
         }
@@ -974,11 +975,11 @@ tape('texture 2d', function (t) {
         width: 5,
         height: 5,
         pixels: [
-          255, 0, 0, 255, 255, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 0,
-          255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 0,
-          0, 0, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0,
-          0, 0, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+          255, 0, 0, 255, 255, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, null, null, null, null,
+          255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, null, null, null, null,
+          0, 0, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, null, null, null, null,
+          0, 0, 0, 255, 0, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, null, null, null, null,
+          null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null
         ],
         format: 'rgba',
         type: 'uint8'

test/util/create-context.js

@@ -1,10 +1,11 @@
 if (typeof document !== 'undefined') {
   var canvas = document.createElement('canvas')
-  var context = canvas.getContext('webgl', {
+  var opts = {
     antialias: false,
     stencil: true,
     preserveDrawingBuffer: true
-  })
+  }
+  var context = canvas.getContext('webgl', opts) || canvas.getContext('experimental-webgl', opts)
   canvas.style.position = 'fixed'
   canvas.style.top = '0'
   canvas.style.right = '0'