Skip to content

A
angle
Commit f2c6faf5 by Jamie Madill Committed by Commit Bot
Options

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/1169306Reviewed-by: 's avatarOmar El Sheikh <theoking@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 4787d70b
Showing with 2 additions and 30 deletions
src/tests/perf_tests/BlitFramebufferPerf.cpp
...@@ -235,16 +235,6 @@ BlitFramebufferParams D3D11(BufferType type, unsigned int samples) ...@@ -235,16 +235,6 @@ BlitFramebufferParams D3D11(BufferType type, unsigned int samples)
params.samples = samples; params.samples = samples;
return params; 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 } // anonymous namespace
// TODO(jmadill): Programatically generate these combinations. // TODO(jmadill): Programatically generate these combinations.
...@@ -256,12 +246,4 @@ ANGLE_INSTANTIATE_TEST(BlitFramebufferPerf, ...@@ -256,12 +246,4 @@ ANGLE_INSTANTIATE_TEST(BlitFramebufferPerf,
D3D11(BufferType::COLOR, 2), D3D11(BufferType::COLOR, 2),
D3D11(BufferType::DEPTH, 2), D3D11(BufferType::DEPTH, 2),
D3D11(BufferType::STENCIL, 2), D3D11(BufferType::STENCIL, 2),
D3D11(BufferType::DEPTH_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))
src/tests/perf_tests/DispatchComputePerf.cpp
...@@ -164,14 +164,6 @@ DispatchComputePerfParams DispatchComputePerfOpenGLOrGLESParams(bool useNullDevi ...@@ -164,14 +164,6 @@ DispatchComputePerfParams DispatchComputePerfOpenGLOrGLESParams(bool useNullDevi
return params; 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) TEST_P(DispatchComputePerfBenchmark, Run)
{ {
run(); run();
...@@ -179,8 +171,6 @@ TEST_P(DispatchComputePerfBenchmark, Run) ...@@ -179,8 +171,6 @@ TEST_P(DispatchComputePerfBenchmark, Run)
ANGLE_INSTANTIATE_TEST(DispatchComputePerfBenchmark, ANGLE_INSTANTIATE_TEST(DispatchComputePerfBenchmark,
DispatchComputePerfOpenGLOrGLESParams(true), DispatchComputePerfOpenGLOrGLESParams(true),
DispatchComputePerfOpenGLOrGLESParams(false), DispatchComputePerfOpenGLOrGLESParams(false));
DispatchComputePerfVulkanParams(true),
DispatchComputePerfVulkanParams(false));
} // namespace } // namespace
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment