Use bytes_per_element with bufferData length

Author: christurnbull

src/augment-api.js

@@ -387,7 +387,9 @@ export function augmentAPI(ctx, nameOfClass, options = {}) {
         throw new Error(`no buffer bound to ${target}`);
       }
       let newSize = 0;
-      if (isBufferSource(src)) {
+      if (length !== undefined) {
+        newSize = length * src.BYTES_PER_ELEMENT;
+      } else if (isBufferSource(src)) {
         newSize = src.byteLength;
       } else if (isNumber(src)) {
         newSize = src;

test/tests/buffer-tests.js

@@ -46,14 +46,14 @@ describe('buffer tests', () => {
 
     gl.bindBuffer(gl.ARRAY_BUFFER, buf1);
     const data1 = new Float32Array(25);
-    const size1 = data1.length * data1.BYTES_PER_ELEMENT;
-    const length1 = data1.length;
+    const length1 = 15;
+    const size1 = length1 * data1.BYTES_PER_ELEMENT;
     gl.bufferData(gl.ARRAY_BUFFER, data1, gl.STATIC_DRAW, 0, length1);
     tracker.addMemory(size1);
 
     const data1a = new Uint16Array(37);
-    const size1a = data1a.length * data1a.BYTES_PER_ELEMENT;
-    const length1a = data1a.length;
+    const length1a = 30;
+    const size1a = length1a * data1a.BYTES_PER_ELEMENT;
     gl.bufferData(gl.ARRAY_BUFFER, data1a, gl.STATIC_DRAW, 0, length1a);
     tracker.addMemory(size1a - size1);
 
@@ -62,8 +62,8 @@ describe('buffer tests', () => {
 
     gl.bindBuffer(gl.ARRAY_BUFFER, buf2);
     const data2 = new Float32Array(55);
-    const size2 = data2.length * data2.BYTES_PER_ELEMENT;
-    const length2 = data2.length;
+    const length2 = 41;
+    const size2 = length2 * data2.BYTES_PER_ELEMENT;
     gl.bufferData(gl.ARRAY_BUFFER, data2, gl.STATIC_DRAW, 0, length2);
     tracker.addMemory(size2);
 

webgl-memory.js

@@ -737,7 +737,9 @@
           throw new Error(`no buffer bound to ${target}`);
         }
         let newSize = 0;
-        if (isBufferSource(src)) {
+        if (length !== undefined) {
+          newSize = length * src.BYTES_PER_ELEMENT;
+        } else if (isBufferSource(src)) {
           newSize = src.byteLength;
         } else if (isNumber(src)) {
           newSize = src;