simple fix?

src/gpu/instanced/GLInstancedRendering.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GLInstancedRendering.h"
 
 #include "GrResourceProvider.h"
@@ skipping 224 matching lines @@
         this->flushInstanceAttribs(batch->fEmulatedBaseInstance);
         GL_CALL(MultiDrawElementsIndirect(GR_GL_TRIANGLES, GR_GL_UNSIGNED_BYTE,
                                           (GrGLDrawElementsIndirectCommand*) nullptr + glCmdsIdx,
                                           numCommands, 0));
         return;
     }
 
     int emulatedBaseInstance = batch->fEmulatedBaseInstance;
     for (int i = 0; i < numCommands; ++i) {
         int glCmdIdx = batch->fGLDrawCmdsIdx + i;
-        const GLDrawCmdInfo& cmdInfo = fGLDrawCmdsInfo[glCmdIdx];
         this->flushInstanceAttribs(emulatedBaseInstance);
         if (fDrawIndirectBuffer) {
             GL_CALL(DrawElementsIndirect(GR_GL_TRIANGLES, GR_GL_UNSIGNED_BYTE,
                                          (GrGLDrawElementsIndirectCommand*) nullptr + glCmdIdx));
         } else {
+            const GLDrawCmdInfo& cmdInfo = fGLDrawCmdsInfo[glCmdIdx];
             GL_CALL(DrawElementsInstanced(GR_GL_TRIANGLES, cmdInfo.fGeometry.fCount,
                                           GR_GL_UNSIGNED_BYTE,
                                           (GrGLubyte*) nullptr + cmdInfo.fGeometry.fStart,
                                           cmdInfo.fInstanceCount));
-        }
-        if (!glCaps.baseInstanceSupport()) {
-            emulatedBaseInstance += cmdInfo.fInstanceCount;

[csmartdalton, 2016/09/15 16:16:24]

This needs to happen for the glDrawElementsIndirect case as well, if you don't
have EXT_base_instance.

You can thank OpenGL ES for making this so confusing and adding an extension
that lets them ignore a field in the DrawIndirect s5ruct :(

+            if (!glCaps.baseInstanceSupport()) {
+                emulatedBaseInstance += cmdInfo.fInstanceCount;
+            }
         }
     }
 }
 
 void GLInstancedRendering::flushInstanceAttribs(int baseInstance) {
     SkASSERT(fVertexArrayID);
     this->glGpu()->bindVertexArray(fVertexArrayID);
 
     SkASSERT(fInstanceBuffer);
     if (fInstanceAttribsBufferUniqueId != fInstanceBuffer->uniqueID() ||
@@ skipping 46 matching lines @@
         GL_CALL(DeleteVertexArrays(1, &fVertexArrayID));
         this->glGpu()->notifyVertexArrayDelete(fVertexArrayID);
     }
     fVertexArrayID = 0;
     fInstanceBuffer.reset();
     fDrawIndirectBuffer.reset();
     fInstanceAttribsBufferUniqueId = SK_InvalidUniqueID;
 }
 
 }