commit ec1fe5b743599d4e19da511e20f44c286f4118a0
author Jamie Madill <jmadill@chromium.org> Fri Aug 10 10:05:52 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Aug 10 19:52:01 2018 +0000
tree fce1cea85c77447020a4a3f346e7cbc769fe122c
parent b0c8be858f9c04f1daa66a5dcf6b089b58e04fd4

D3D: Use angle::Result error pattern.

This completes the refactor for the D3D9/D3D11 back-ends.

Bug: angleproject:2752
Change-Id: Ie35a925f75c902d8f9fdab6bc33b3bb9c937f85b
Reviewed-on: https://chromium-review.googlesource.com/1167209
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/tests/perf_tests/IndexDataManagerTest.cpp

diff --git a/src/tests/perf_tests/IndexDataManagerTest.cpp b/src/tests/perf_tests/IndexDataManagerTest.cpp
index d4d627e..5927f44 100644
--- a/src/tests/perf_tests/IndexDataManagerTest.cpp
+++ b/src/tests/perf_tests/IndexDataManagerTest.cpp
@@ -29,11 +29,12 @@
     {
     }
 
-    MOCK_METHOD4(initialize, gl::Error(const gl::Context *, unsigned int, GLenum, bool));
-    MOCK_METHOD4(mapBuffer, gl::Error(const gl::Context *, unsigned int, unsigned int, void **));
-    MOCK_METHOD1(unmapBuffer, gl::Error(const gl::Context *));
-    MOCK_METHOD1(discard, gl::Error(const gl::Context *));
-    MOCK_METHOD3(setSize, gl::Error(const gl::Context *, unsigned int, GLenum));
+    MOCK_METHOD4(initialize, angle::Result(const gl::Context *, unsigned int, GLenum, bool));
+    MOCK_METHOD4(mapBuffer,
+                 angle::Result(const gl::Context *, unsigned int, unsigned int, void **));
+    MOCK_METHOD1(unmapBuffer, angle::Result(const gl::Context *));
+    MOCK_METHOD1(discard, angle::Result(const gl::Context *));
+    MOCK_METHOD3(setSize, angle::Result(const gl::Context *, unsigned int, GLenum));
 
     // inlined for speed
     GLenum getIndexType() const override { return mIndexType; }
@@ -56,12 +57,12 @@
     MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(gl::VertexFormatType));
     MOCK_CONST_METHOD1(getVertexComponentType, GLenum(gl::VertexFormatType));
     MOCK_CONST_METHOD6(getVertexSpaceRequired,
-                       gl::Error(const gl::Context *,
-                                 const gl::VertexAttribute &,
-                                 const gl::VertexBinding &,
-                                 size_t,
-                                 GLsizei,
-                                 unsigned int *));
+                       angle::Result(const gl::Context *,
+                                     const gl::VertexAttribute &,
+                                     const gl::VertexBinding &,
+                                     size_t,
+                                     GLsizei,
+                                     unsigned int *));
 
     // Dependency injection
     rx::IndexBuffer *createIndexBuffer() override
@@ -103,16 +104,16 @@
     MOCK_METHOD2(unmap, gl::Error(const gl::Context *context, GLboolean *));
 
     // BufferD3D
-    MOCK_METHOD1(markTransformFeedbackUsage, gl::Error(const gl::Context *));
+    MOCK_METHOD1(markTransformFeedbackUsage, angle::Result(const gl::Context *));
 
     // inlined for speed
     bool supportsDirectBinding() const override { return false; }
     size_t getSize() const override { return mData.size(); }
 
-    gl::Error getData(const gl::Context *context, const uint8_t **outData) override
+    angle::Result getData(const gl::Context *context, const uint8_t **outData) override
     {
         *outData = &mData[0];
-        return gl::NoError();
+        return angle::Result::Continue();
     }
 
   private: