Merge branch 'master' of github.com:flutter/engine into draw_circles

impeller/core/formats.h

@@ -308,7 +308,7 @@ enum class IndexType {
   kUnknown,
   k16bit,
   k32bit,
-  // Do not use the index buffer.
+  /// Does not use the index buffer.
   kNone,
 };
 

impeller/renderer/backend/metal/render_pass_mtl.mm

@@ -486,13 +486,25 @@ static bool Bind(PassBindingsCache& pass,
                               ShaderStage::kFragment)) {
       return false;
     }
-    const PrimitiveType primitive_type = pipeline_desc.GetPrimitiveType();
 
+    const PrimitiveType primitive_type = pipeline_desc.GetPrimitiveType();
     if (command.index_type == IndexType::kNone) {
-      auto vtx_buffer = command.GetVertexBuffer();
-      [encoder drawPrimitives:ToMTLPrimitiveType(primitive_type)
-                  vertexStart:command.base_vertex
-                  vertexCount:command.index_count];
+      if (command.instance_count != 1u) {
+#if TARGET_OS_SIMULATOR
+        VALIDATION_LOG << "iOS Simulator does not support instanced rendering.";
+        return false;
+#endif
+        [encoder drawPrimitives:ToMTLPrimitiveType(primitive_type)
+                    vertexStart:command.base_vertex
+                    vertexCount:command.vertex_count
+                  instanceCount:command.instance_count
+                   baseInstance:0u];
+
+      } else {
+        [encoder drawPrimitives:ToMTLPrimitiveType(primitive_type)
+                    vertexStart:command.base_vertex
+                    vertexCount:command.vertex_count];
+      }
       continue;
     }
 
@@ -513,7 +525,7 @@ static bool Bind(PassBindingsCache& pass,
       return false;
     }
 
-    FML_DCHECK(command.index_count *
+    FML_DCHECK(command.vertex_count *
                    (command.index_type == IndexType::k16bit ? 2 : 4) ==
                command.index_buffer.range.length);
 

impeller/renderer/vertex_buffer_builder.h

@@ -75,6 +75,7 @@ class VertexBufferBuilder {
   VertexBuffer CreateVertexBuffer(HostBuffer& host_buffer) const {
     VertexBuffer buffer;
     buffer.vertex_buffer = CreateVertexBufferView(host_buffer);
+<<<<<<< HEAD
     if (indices_.size() == 0) {
       buffer.index_count = GetVertexCount();
       buffer.index_type = impeller::IndexType::kNone;
@@ -83,6 +84,11 @@ class VertexBufferBuilder {
       buffer.index_count = GetIndexCount();
       buffer.index_type = GetIndexType();
     }
+=======
+    buffer.index_buffer = CreateIndexBufferView(host_buffer);
+    buffer.vertex_count = GetIndexCount();
+    buffer.index_type = GetIndexType();
+>>>>>>> 3e608274c9526b7707c8f3798d41f6e937e386f7
     return buffer;
   };