Merge pull request #1665 from juj/validate_gl_spec_64

Validate gl spec 64

1 files changed, 56 insertions, 0 deletions

diff --git a/src/library_gl.js b/src/library_gl.js
index a4d35aff..83e68777 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -310,6 +310,9 @@ var LibraryGL = {
         Module.ctx.bufferSubData(Module.ctx.ARRAY_BUFFER,
                                  0,
                                  HEAPU8.subarray(cb.ptr, cb.ptr + size));
+#if GL_ASSERTIONS
+        GL.validateVertexAttribPointer(cb.size, cb.type, cb.stride, 0);
+#endif
         Module.ctx.vertexAttribPointer(i, cb.size, cb.type, cb.normalized, cb.stride, 0);
       }
     },
@@ -331,6 +334,44 @@ var LibraryGL = {
         }
       }
     },
+    // Validates that user obeys GL spec #6.4: http://www.khronos.org/registry/webgl/specs/latest/1.0/#6.4
+    validateVertexAttribPointer: function(dimension, dataType, stride, offset) {
+      var sizeBytes = 1;
+      switch(dataType) {
+        case 0x1400 /* GL_BYTE */:
+        case 0x1401 /* GL_UNSIGNED_BYTE */:
+          sizeBytes = 1;
+          break;
+        case 0x1402 /* GL_SHORT */: 
+        case 0x1403 /* GL_UNSIGNED_SHORT */: 
+          sizeBytes = 2; 
+          break;
+        case 0x1404 /* GL_INT */:
+        case 0x1405 /* GL_UNSIGNED_INT */:
+        case 0x1406 /* GL_FLOAT */:
+          sizeBytes = 4;
+          break;
+        case 0x140A /* GL_DOUBLE */:
+          sizeBytes = 8;
+          break;
+        default:
+          console.error('Invalid vertex attribute data type GLenum ' + dataType + ' passed to GL function!');
+      }
+      if (dimension == 0x80E1 /* GL_BGRA */) {
+        console.error('WebGL does not support size=GL_BGRA in a call to glVertexAttribPointer! Please use size=4 and type=GL_UNSIGNED_BYTE instead!');
+      } else if (dimension < 1 || dimension > 4) {
+        console.error('Invalid dimension='+dimension+' in call to glVertexAttribPointer, must be 1,2,3 or 4.');
+      }
+      if (stride < 0 || stride > 255) {
+        console.error('Invalid stride='+stride+' in call to glVertexAttribPointer. Note that maximum supported stride in WebGL is 255!');
+      }
+      if (offset % sizeBytes != 0) {
+        console.error('GL spec section 6.4 error: vertex attribute data offset of ' + offset + ' bytes should have been a multiple of the data type size that was used: GLenum ' + dataType + ' has size of ' + sizeBytes + ' bytes!');
+      }
+      if (stride % sizeBytes != 0) {
+        console.error('GL spec section 6.4 error: vertex attribute data stride of ' + stride + ' bytes should have been a multiple of the data type size that was used: GLenum ' + dataType + ' has size of ' + sizeBytes + ' bytes!');
+      }
+    },
 #endif
 
     initExtensions: function() {
@@ -3273,6 +3314,9 @@ var LibraryGL = {
 
           var clientAttributes = GL.immediate.clientAttributes;
 
+#if GL_ASSERTIONS
+          GL.validateVertexAttribPointer(positionSize, positionType, GL.immediate.stride, clientAttributes[GL.immediate.VERTEX].offset);
+#endif
           Module.ctx.vertexAttribPointer(this.positionLocation, positionSize, positionType, false,
                                          GL.immediate.stride, clientAttributes[GL.immediate.VERTEX].offset);
           Module.ctx.enableVertexAttribArray(this.positionLocation);
@@ -3285,6 +3329,9 @@ var LibraryGL = {
               if (attribLoc === undefined || attribLoc < 0) continue;
 
               if (texUnitID < textureSizes.length && textureSizes[texUnitID]) {
+#if GL_ASSERTIONS
+                GL.validateVertexAttribPointer(textureSizes[texUnitID], textureTypes[texUnitID], GL.immediate.stride, GL.immediate.clientAttributes[GL.immediate.TEXTURE0 + texUnitID].offset);
+#endif
                 Module.ctx.vertexAttribPointer(attribLoc, textureSizes[texUnitID], textureTypes[texUnitID], false,
                                                GL.immediate.stride, GL.immediate.clientAttributes[GL.immediate.TEXTURE0 + texUnitID].offset);
                 Module.ctx.enableVertexAttribArray(attribLoc);
@@ -3301,6 +3348,9 @@ var LibraryGL = {
             }
           }
           if (colorSize) {
+#if GL_ASSERTIONS
+            GL.validateVertexAttribPointer(colorSize, colorType, GL.immediate.stride, clientAttributes[GL.immediate.COLOR].offset);
+#endif
             Module.ctx.vertexAttribPointer(this.colorLocation, colorSize, colorType, true,
                                            GL.immediate.stride, clientAttributes[GL.immediate.COLOR].offset);
             Module.ctx.enableVertexAttribArray(this.colorLocation);
@@ -3309,6 +3359,9 @@ var LibraryGL = {
             Module.ctx.vertexAttrib4fv(this.colorLocation, GL.immediate.clientColor);
           }
           if (this.hasNormal) {
+#if GL_ASSERTIONS
+            GL.validateVertexAttribPointer(normalSize, normalType, GL.immediate.stride, clientAttributes[GL.immediate.NORMAL].offset);
+#endif
             Module.ctx.vertexAttribPointer(this.normalLocation, normalSize, normalType, true,
                                            GL.immediate.stride, clientAttributes[GL.immediate.NORMAL].offset);
             Module.ctx.enableVertexAttribArray(this.normalLocation);
@@ -4288,6 +4341,9 @@ var LibraryGL = {
     }
     cb.clientside = false;
 #endif
+#if GL_ASSERTIONS
+    GL.validateVertexAttribPointer(size, type, stride, ptr);
+#endif
     Module.ctx.vertexAttribPointer(index, size, type, normalized, stride, ptr);
   },