Don't use ErrorOrResult in VertexBuffer.h.

src/libANGLE/renderer/d3d/VertexBuffer.cpp

@@ -90,12 +90,12 @@ gl::Error VertexBufferInterface::setBufferSize(const gl::Context *context, unsig
     return mVertexBuffer->setBufferSize(context, size);
 }
 
-gl::ErrorOrResult<unsigned int> VertexBufferInterface::getSpaceRequired(
-    const gl::Context *context,
+gl::Error VertexBufferInterface::getSpaceRequired(const gl::Context *context,
                                                   const gl::VertexAttribute &attrib,
                                                   const gl::VertexBinding &binding,
                                                   size_t count,
-    GLsizei instances) const
+                                                  GLsizei instances,
+                                                  unsigned int *spaceInBytesOut) const
 {
     unsigned int spaceRequired = 0;
     ANGLE_TRY(mFactory->getVertexSpaceRequired(context, attrib, binding, count, instances,
@@ -110,7 +110,8 @@ gl::ErrorOrResult<unsigned int> VertexBufferInterface::getSpaceRequired(
                << "Vertex buffer overflow in VertexBufferInterface::getSpaceRequired.";
     }
 
-    return alignedSpaceRequired;
+    *spaceInBytesOut = alignedSpaceRequired;
+    return gl::NoError();
 }
 
 gl::Error VertexBufferInterface::discard(const gl::Context *context)
@@ -177,7 +178,7 @@ gl::Error StreamingVertexBufferInterface::storeDynamicAttribute(const gl::Contex
                                                                 const uint8_t *sourceData)
 {
     unsigned int spaceRequired = 0;
-    ANGLE_TRY_RESULT(getSpaceRequired(context, attrib, binding, count, instances), spaceRequired);
+    ANGLE_TRY(getSpaceRequired(context, attrib, binding, count, instances, &spaceRequired));
 
     // Protect against integer overflow
     angle::CheckedNumeric<unsigned int> checkedPosition(mWritePosition);
@@ -297,7 +298,7 @@ gl::Error StaticVertexBufferInterface::storeStaticAttribute(const gl::Context *c
                                                             const uint8_t *sourceData)
 {
     unsigned int spaceRequired = 0;
-    ANGLE_TRY_RESULT(getSpaceRequired(context, attrib, binding, count, instances), spaceRequired);
+    ANGLE_TRY(getSpaceRequired(context, attrib, binding, count, instances, &spaceRequired));
     ANGLE_TRY(setBufferSize(context, spaceRequired));
 
     ASSERT(attrib.enabled);

src/libANGLE/renderer/d3d/VertexBuffer.h

@@ -95,11 +95,12 @@ class VertexBufferInterface : angle::NonCopyable
 
     gl::Error setBufferSize(const gl::Context *context, unsigned int size);
 
-    gl::ErrorOrResult<unsigned int> getSpaceRequired(const gl::Context *context,
+    gl::Error getSpaceRequired(const gl::Context *context,
                                const gl::VertexAttribute &attrib,
                                const gl::VertexBinding &binding,
                                size_t count,
-                                                     GLsizei instances) const;
+                               GLsizei instances,
+                               unsigned int *spaceInBytesOut) const;
     BufferFactoryD3D *const mFactory;
     VertexBuffer *mVertexBuffer;
     bool mDynamic;