Only disable vertex attrib arrays when not using VAOs

This saves on disableVertexAttribArray calls. They are always disabled
at the end of doDrawList since picking still enables arrays on the
default VAO.

src/core/display/chunks/geometryChunk.js

@@ -104,8 +104,11 @@ SceneJS_ChunkFactory.createChunkType({
                 return;
             }
         } else if (ctx.VAO) {
+            // Start creating a new VAO by switching to the default VAO, which doesn't have attribs enabled.
+            ctx.VAO.bindVertexArrayOES(null);
             this.VAO = ctx.VAO.createVertexArrayOES();
             ctx.VAO.bindVertexArrayOES(this.VAO);
+            var gl = this.program.gl;
         }
 
         if (doMorph) {

src/core/display/chunks/programChunk.js

@@ -16,12 +16,10 @@ SceneJS_ChunkFactory.createChunkType({
 
         var gl = this.program.gl;
 
-        if (frameCtx.VAO) {
-            frameCtx.VAO.bindVertexArrayOES(null);
-        }
-
-        for (var i = 0; i < 10; i++) {
-            gl.disableVertexAttribArray(i);
+        if (!frameCtx.VAO) {
+            for (var i = 0; i < 10; i++) {
+                gl.disableVertexAttribArray(i);
+            }
         }
     },
 

src/core/display/display.js

@@ -999,6 +999,9 @@ SceneJS_Display.prototype._doDrawList = function (pick, rayPick) {
 
     if (frameCtx.VAO) {
         frameCtx.VAO.bindVertexArrayOES(null);
+        for (var i = 0; i < 10; i++) {
+            gl.disableVertexAttribArray(i);
+        }
     }
 };