Skip to content

A
angle
Commit 1754ba0d by Jamie Madill Committed by Commit Bot
Options

Remove unsupported test configs.

The ES3 D3D11 FL 10.0 configs won't ever work, and the Vulkan ES3 config won't be supported for some time. BUG=None Change-Id: I9bb10da607f3a993fb0f9ec580058e5918969dac Reviewed-on: https://chromium-review.googlesource.com/424070 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 38ef7c8c
Showing with 5 additions and 33 deletions
src/tests/egl_tests/EGLVulkanEXTTest.cpp
...@@ -30,6 +30,6 @@ TEST_P(VulkanEXTTest, ValidationLayersAvaialable) ...@@ -30,6 +30,6 @@ TEST_P(VulkanEXTTest, ValidationLayersAvaialable)
ASSERT_TRUE(getEGLWindow()->initializeGL(GetOSWindow())); ASSERT_TRUE(getEGLWindow()->initializeGL(GetOSWindow()));
} }
ANGLE_INSTANTIATE_TEST(VulkanEXTTest, ES2_VULKAN(), ES3_VULKAN()); ANGLE_INSTANTIATE_TEST(VulkanEXTTest, ES2_VULKAN());
} // anonymous namespace } // anonymous namespace
src/tests/gl_tests/RendererTest.cpp
...@@ -185,23 +185,20 @@ ANGLE_INSTANTIATE_TEST(RendererTest, ...@@ -185,23 +185,20 @@ ANGLE_INSTANTIATE_TEST(RendererTest,
ES2_D3D11_FL10_0_REFERENCE(), ES2_D3D11_FL10_0_REFERENCE(),
ES2_D3D11_FL9_3_REFERENCE(), ES2_D3D11_FL9_3_REFERENCE(),
// ES3 on top of D3D11 feature level 9.3 to 11.0 // ES3 on top of D3D11.
ES3_D3D11(), ES3_D3D11(),
ES3_D3D11_FL11_0(), ES3_D3D11_FL11_0(),
ES3_D3D11_FL10_1(), ES3_D3D11_FL10_1(),
ES3_D3D11_FL10_0(),
// ES3 on top of D3D11 WARP feature level 9.3 to 11.0 // ES3 on top of D3D11 WARP.
ES3_D3D11_WARP(), ES3_D3D11_WARP(),
ES3_D3D11_FL11_0_WARP(), ES3_D3D11_FL11_0_WARP(),
ES3_D3D11_FL10_1_WARP(), ES3_D3D11_FL10_1_WARP(),
ES3_D3D11_FL10_0_WARP(),
// ES3 on top of D3D11 reference feature level 9.3 to 11.0 // ES3 on top of the D3D11 reference rasterizer.
ES3_D3D11_REFERENCE(), ES3_D3D11_REFERENCE(),
ES3_D3D11_FL11_0_REFERENCE(), ES3_D3D11_FL11_0_REFERENCE(),
ES3_D3D11_FL10_1_REFERENCE(), ES3_D3D11_FL10_1_REFERENCE(),
ES3_D3D11_FL10_0_REFERENCE(),
// ES2 on top of desktop OpenGL versions 2.1 to 4.5 // ES2 on top of desktop OpenGL versions 2.1 to 4.5
ES2_OPENGL(), ES2_OPENGL(),
...@@ -247,6 +244,5 @@ ANGLE_INSTANTIATE_TEST(RendererTest, ...@@ -247,6 +244,5 @@ ANGLE_INSTANTIATE_TEST(RendererTest,
ES31_NULL(), ES31_NULL(),
// ES on top of Vulkan // ES on top of Vulkan
ES2_VULKAN(), ES2_VULKAN());
ES3_VULKAN());
} // anonymous namespace } // anonymous namespace
src/tests/test_utils/angle_test_configs.cpp
...@@ -491,11 +491,6 @@ PlatformParameters ES3_D3D11_FL10_1() ...@@ -491,11 +491,6 @@ PlatformParameters ES3_D3D11_FL10_1()
return PlatformParameters(3, 0, egl_platform::D3D11_FL10_1()); return PlatformParameters(3, 0, egl_platform::D3D11_FL10_1());
} }
PlatformParameters ES3_D3D11_FL10_0()
{
return PlatformParameters(3, 0, egl_platform::D3D11_FL10_0());
}
PlatformParameters ES3_D3D11_WARP() PlatformParameters ES3_D3D11_WARP()
{ {
return PlatformParameters(3, 0, egl_platform::D3D11_WARP()); return PlatformParameters(3, 0, egl_platform::D3D11_WARP());
...@@ -516,11 +511,6 @@ PlatformParameters ES3_D3D11_FL10_1_WARP() ...@@ -516,11 +511,6 @@ PlatformParameters ES3_D3D11_FL10_1_WARP()
return PlatformParameters(3, 0, egl_platform::D3D11_FL10_1_WARP()); return PlatformParameters(3, 0, egl_platform::D3D11_FL10_1_WARP());
} }
PlatformParameters ES3_D3D11_FL10_0_WARP()
{
return PlatformParameters(3, 0, egl_platform::D3D11_FL10_0_WARP());
}
PlatformParameters ES3_D3D11_REFERENCE() PlatformParameters ES3_D3D11_REFERENCE()
{ {
return PlatformParameters(3, 0, egl_platform::D3D11_REFERENCE()); return PlatformParameters(3, 0, egl_platform::D3D11_REFERENCE());
...@@ -541,11 +531,6 @@ PlatformParameters ES3_D3D11_FL10_1_REFERENCE() ...@@ -541,11 +531,6 @@ PlatformParameters ES3_D3D11_FL10_1_REFERENCE()
return PlatformParameters(3, 0, egl_platform::D3D11_FL10_1_REFERENCE()); return PlatformParameters(3, 0, egl_platform::D3D11_FL10_1_REFERENCE());
} }
PlatformParameters ES3_D3D11_FL10_0_REFERENCE()
{
return PlatformParameters(3, 0, egl_platform::D3D11_FL10_0_REFERENCE());
}
PlatformParameters ES2_OPENGLES() PlatformParameters ES2_OPENGLES()
{ {
return PlatformParameters(2, 0, egl_platform::OPENGLES()); return PlatformParameters(2, 0, egl_platform::OPENGLES());
...@@ -626,9 +611,4 @@ PlatformParameters ES2_VULKAN() ...@@ -626,9 +611,4 @@ PlatformParameters ES2_VULKAN()
return PlatformParameters(2, 0, egl_platform::VULKAN()); return PlatformParameters(2, 0, egl_platform::VULKAN());
} }
PlatformParameters ES3_VULKAN()
{
return PlatformParameters(3, 0, egl_platform::VULKAN());
}
} // namespace angle } // namespace angle
src/tests/test_utils/angle_test_configs.h
...@@ -113,19 +113,16 @@ PlatformParameters ES3_D3D11(); ...@@ -113,19 +113,16 @@ PlatformParameters ES3_D3D11();
PlatformParameters ES3_D3D11_FL11_1(); PlatformParameters ES3_D3D11_FL11_1();
PlatformParameters ES3_D3D11_FL11_0(); PlatformParameters ES3_D3D11_FL11_0();
PlatformParameters ES3_D3D11_FL10_1(); PlatformParameters ES3_D3D11_FL10_1();
PlatformParameters ES3_D3D11_FL10_0();
PlatformParameters ES3_D3D11_WARP(); PlatformParameters ES3_D3D11_WARP();
PlatformParameters ES3_D3D11_FL11_1_WARP(); PlatformParameters ES3_D3D11_FL11_1_WARP();
PlatformParameters ES3_D3D11_FL11_0_WARP(); PlatformParameters ES3_D3D11_FL11_0_WARP();
PlatformParameters ES3_D3D11_FL10_1_WARP(); PlatformParameters ES3_D3D11_FL10_1_WARP();
PlatformParameters ES3_D3D11_FL10_0_WARP();
PlatformParameters ES3_D3D11_REFERENCE(); PlatformParameters ES3_D3D11_REFERENCE();
PlatformParameters ES3_D3D11_FL11_1_REFERENCE(); PlatformParameters ES3_D3D11_FL11_1_REFERENCE();
PlatformParameters ES3_D3D11_FL11_0_REFERENCE(); PlatformParameters ES3_D3D11_FL11_0_REFERENCE();
PlatformParameters ES3_D3D11_FL10_1_REFERENCE(); PlatformParameters ES3_D3D11_FL10_1_REFERENCE();
PlatformParameters ES3_D3D11_FL10_0_REFERENCE();
PlatformParameters ES2_OPENGL(); PlatformParameters ES2_OPENGL();
PlatformParameters ES2_OPENGL(EGLint major, EGLint minor); PlatformParameters ES2_OPENGL(EGLint major, EGLint minor);
...@@ -146,7 +143,6 @@ PlatformParameters ES3_NULL(); ...@@ -146,7 +143,6 @@ PlatformParameters ES3_NULL();
PlatformParameters ES31_NULL(); PlatformParameters ES31_NULL();
PlatformParameters ES2_VULKAN(); PlatformParameters ES2_VULKAN();
PlatformParameters ES3_VULKAN();
} // namespace angle } // namespace angle
......
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