commit d633b1569a21050c5bf392a724e3ead71e4d8b07
author Frank Henigman <fjhenigman@chromium.org> Thu Oct 04 23:34:31 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Oct 16 20:44:11 2018 +0000
tree ecd1e4df8c0df723315bf2de613ff715deee6166
parent 6eba3c6104f25fe39d55ff495e06e7178d2aed9f

Get rid of VertexFormatType.

The enum VertexFormatType is redundant with angle::FormatID.  The Vulkan
back end has already eschewed VertexFormatType, this change updates the
D3D back ends.

BUG=angleproject:2531

Change-Id: I67ea2203ca80be828f4c757a37810fe67a279364
Reviewed-on: https://chromium-review.googlesource.com/c/1263899
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Frank Henigman <fjhenigman@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 5927f44..93bee31 100644
--- a/src/tests/perf_tests/IndexDataManagerTest.cpp
+++ b/src/tests/perf_tests/IndexDataManagerTest.cpp
@@ -54,8 +54,8 @@
     }
 
     MOCK_METHOD0(createVertexBuffer, rx::VertexBuffer *());
-    MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(gl::VertexFormatType));
-    MOCK_CONST_METHOD1(getVertexComponentType, GLenum(gl::VertexFormatType));
+    MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(angle::FormatID));
+    MOCK_CONST_METHOD1(getVertexComponentType, GLenum(angle::FormatID));
     MOCK_CONST_METHOD6(getVertexSpaceRequired,
                        angle::Result(const gl::Context *,
                                      const gl::VertexAttribute &,