BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 8 insertions, 4 deletions

diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
index b0e27c9f0c6..0f6450707c3 100644
--- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
+++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
@@ -127,7 +127,8 @@ angle::Result VertexArray11::syncStateForDraw(const gl::Context *context,
                                               gl::DrawElementsType indexTypeOrInvalid,
                                               const void *indices,
                                               GLsizei instances,
-                                              GLint baseVertex)
+                                              GLint baseVertex,
+                                              GLuint baseInstance)
 {
     Renderer11 *renderer         = GetImplAs<Context11>(context)->getRenderer();
     StateManager11 *stateManager = renderer->getStateManager();
@@ -159,7 +160,8 @@ angle::Result VertexArray11::syncStateForDraw(const gl::Context *context,
         {
             ANGLE_TRY(updateDynamicAttribs(context, stateManager->getVertexDataManager(),
                                            firstVertex, vertexOrIndexCount, indexTypeOrInvalid,
-                                           indices, instances, baseVertex, activeDynamicAttribs));
+                                           indices, instances, baseVertex, baseInstance,
+                                           activeDynamicAttribs));
             stateManager->invalidateInputLayout();
         }
     }
@@ -293,6 +295,7 @@ angle::Result VertexArray11::updateDynamicAttribs(const gl::Context *context,
                                                   const void *indices,
                                                   GLsizei instances,
                                                   GLint baseVertex,
+                                                  GLuint baseInstance,
                                                   const gl::AttributesMask &activeDynamicAttribs)
 {
     const auto &glState  = context->getState();
@@ -316,8 +319,9 @@ angle::Result VertexArray11::updateDynamicAttribs(const gl::Context *context,
         dynamicAttrib->divisor = dynamicAttrib->binding->getDivisor() * mAppliedNumViewsToDivisor;
     }
 
-    ANGLE_TRY(vertexDataManager->storeDynamicAttribs(
-        context, &mTranslatedAttribs, activeDynamicAttribs, startVertex, vertexCount, instances));
+    ANGLE_TRY(vertexDataManager->storeDynamicAttribs(context, &mTranslatedAttribs,
+                                                     activeDynamicAttribs, startVertex, vertexCount,
+                                                     instances, baseInstance));
 
     VertexDataManager::PromoteDynamicAttribs(context, mTranslatedAttribs, activeDynamicAttribs,
                                              vertexCount);