commit f2c6faf5f28e6d89e3246535beda7034490b5c1e
author Jamie Madill <jmadill@chromium.org> Thu Aug 09 10:54:08 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Aug 09 21:07:13 2018 +0000
tree 5410089dd2d76001a140e925a94809d2719ddc40
parent 4787d70ba4d7a655505c9d3ee809331a18d4cc04

Remove some Vulkan perftest configs.

We don't support ES 3.0 or ES 3.1 in Vulkan yet. Remove Vulkan configs
from tests that don't support the higher features levels. We can
re-add them once we improve Vulkan support.

Bug: angleproject:2604
Change-Id: Icca57b5ec696aaeb2a571b79cd1a7869f806c176
Reviewed-on: https://chromium-review.googlesource.com/1169306
Reviewed-by: Omar El Sheikh <theoking@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/tests/perf_tests/BlitFramebufferPerf.cpp

diff --git a/src/tests/perf_tests/BlitFramebufferPerf.cpp b/src/tests/perf_tests/BlitFramebufferPerf.cpp
index 76e1937..ad67766 100644
--- a/src/tests/perf_tests/BlitFramebufferPerf.cpp
+++ b/src/tests/perf_tests/BlitFramebufferPerf.cpp
@@ -235,16 +235,6 @@
     params.samples       = samples;
     return params;
 }
-
-BlitFramebufferParams Vulkan(BufferType type, unsigned int samples)
-{
-    BlitFramebufferParams params;
-    params.eglParameters = angle::egl_platform::VULKAN();
-    params.type          = type;
-    params.samples       = samples;
-    return params;
-}
-
 }  // anonymous namespace
 
 // TODO(jmadill): Programatically generate these combinations.
@@ -256,12 +246,4 @@
                        D3D11(BufferType::COLOR, 2),
                        D3D11(BufferType::DEPTH, 2),
                        D3D11(BufferType::STENCIL, 2),
-                       D3D11(BufferType::DEPTH_STENCIL, 2),
-                       Vulkan(BufferType::COLOR, 0),
-                       Vulkan(BufferType::DEPTH, 0),
-                       Vulkan(BufferType::STENCIL, 0),
-                       Vulkan(BufferType::DEPTH_STENCIL, 0),
-                       Vulkan(BufferType::COLOR, 2),
-                       Vulkan(BufferType::DEPTH, 2),
-                       Vulkan(BufferType::STENCIL, 2),
-                       Vulkan(BufferType::DEPTH_STENCIL, 2))
+                       D3D11(BufferType::DEPTH_STENCIL, 2))

src/tests/perf_tests/DispatchComputePerf.cpp

diff --git a/src/tests/perf_tests/DispatchComputePerf.cpp b/src/tests/perf_tests/DispatchComputePerf.cpp
index c6d5fa2..567b77f 100644
--- a/src/tests/perf_tests/DispatchComputePerf.cpp
+++ b/src/tests/perf_tests/DispatchComputePerf.cpp
@@ -164,14 +164,6 @@
     return params;
 }
 
-DispatchComputePerfParams DispatchComputePerfVulkanParams(bool useNullDevice)
-{
-    DispatchComputePerfParams params;
-    params.eglParameters =
-        useNullDevice ? angle::egl_platform::VULKAN() : angle::egl_platform::VULKAN_NULL();
-    return params;
-}
-
 TEST_P(DispatchComputePerfBenchmark, Run)
 {
     run();
@@ -179,8 +171,6 @@
 
 ANGLE_INSTANTIATE_TEST(DispatchComputePerfBenchmark,
                        DispatchComputePerfOpenGLOrGLESParams(true),
-                       DispatchComputePerfOpenGLOrGLESParams(false),
-                       DispatchComputePerfVulkanParams(true),
-                       DispatchComputePerfVulkanParams(false));
+                       DispatchComputePerfOpenGLOrGLESParams(false));
 
 }  // namespace