Don't use ErrorOrResult in VertexBuffer.h.

This enables the error refactor for D3D. Bug: angleproject:2752 Change-Id: I7bb293d6c271d0bffb4d00b55029426b6cd0a42e Reviewed-on: https://chromium-review.googlesource.com/1167208Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Don't use ErrorOrResult in VertexBuffer.h.
7cc1e556 · Jamie Madill · Commit Bot · c86c8b0c · 7cc1e556 · 7cc1e556
Commit 7cc1e556 authored Aug 08, 2018 by Jamie Madill Committed by Commit Bot Aug 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 14 deletions

VertexBuffer.cpp src/libANGLE/renderer/d3d/VertexBuffer.cpp +10 -9

VertexBuffer.h src/libANGLE/renderer/d3d/VertexBuffer.h +6 -5

No files found.
--- a/src/libANGLE/renderer/d3d/VertexBuffer.cpp
+++ b/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,
-    const gl::VertexAttribute &attrib,
-    const gl::VertexBinding &binding,
-    size_t count,
-    GLsizei instances) const
+gl::Error VertexBufferInterface::getSpaceRequired(const gl::Context *context,
+                                                  const gl::VertexAttribute &attrib,
+                                                  const gl::VertexBinding &binding,
+                                                  size_t count,
+                                                  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);

--- a/src/libANGLE/renderer/d3d/VertexBuffer.h
+++ b/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,
-                                                     const gl::VertexAttribute &attrib,
-                                                     const gl::VertexBinding &binding,
-                                                     size_t count,
-                                                     GLsizei instances) const;
+    gl::Error getSpaceRequired(const gl::Context *context,
+                               const gl::VertexAttribute &attrib,
+                               const gl::VertexBinding &binding,
+                               size_t count,
+                               GLsizei instances,
+                               unsigned int *spaceInBytesOut) const;
    BufferFactoryD3D *const mFactory;
    VertexBuffer *mVertexBuffer;
    bool mDynamic;