Skip to content

A
angle
Commit 0864a7ac by Shahbaz Youssefi Committed by Commit Bot
Options

Vulkan: Enable end2end tests for ES2_VULKAN everywhere

Used a script to find test files that have more ES2_OPENGL() invocations than ES2_VULKAN(), and added ES2_VULKAN() to those. There may be false negatives. Bug: angleproject:1578 Change-Id: I938eb3571c909879e9276b355a9f1d324880f99a Reviewed-on: https://chromium-review.googlesource.com/c/1324350Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent cd47a379
Showing with 111 additions and 48 deletions
src/tests/egl_tests/EGLBlobCacheTest.cpp
......@@ -227,4 +227,4 @@ TEST_P(EGLBlobCacheTest, NegativeAPI)
EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
}
ANGLE_INSTANTIATE_TEST(EGLBlobCacheTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
ANGLE_INSTANTIATE_TEST(EGLBlobCacheTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
src/tests/egl_tests/EGLContextCompatibilityTest.cpp
......@@ -365,5 +365,6 @@ ANGLE_INSTANTIATE_TEST(EGLContextCompatibilityTest,
ES2_D3D9(),
ES2_D3D11(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
#endif
src/tests/egl_tests/EGLDebugTest.cpp
......@@ -181,6 +181,7 @@ ANGLE_INSTANTIATE_TEST(EGLDebugTest,
ES2_D3D11(),
ES3_D3D11(),
ES2_OPENGL(),
ES3_OPENGL());
ES3_OPENGL(),
ES2_VULKAN());
} // namespace angle
src/tests/egl_tests/EGLProgramCacheControlTest.cpp
......@@ -259,4 +259,8 @@ TEST_P(EGLProgramCacheControlTest, LinkProgramWithBadShaders)
glDeleteProgram(program);
}
ANGLE_INSTANTIATE_TEST(EGLProgramCacheControlTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
ANGLE_INSTANTIATE_TEST(EGLProgramCacheControlTest,
ES2_D3D9(),
ES2_D3D11(),
ES2_OPENGL(),
ES2_VULKAN());
src/tests/egl_tests/EGLQueryContextTest.cpp
......@@ -149,5 +149,11 @@ TEST_P(EGLQueryContextTest, BadAttribute)
EXPECT_TRUE(eglGetError() == EGL_BAD_ATTRIBUTE);
}
ANGLE_INSTANTIATE_TEST(EGLQueryContextTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES2_OPENGL(),
ES3_D3D11(), ES3_OPENGL());
ANGLE_INSTANTIATE_TEST(EGLQueryContextTest,
ES2_D3D9(),
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_OPENGL(),
ES2_VULKAN(),
ES3_D3D11(),
ES3_OPENGL());
src/tests/egl_tests/EGLStreamTest.cpp
......@@ -833,6 +833,7 @@ ANGLE_INSTANTIATE_TEST(EGLStreamTest,
ES2_D3D11(),
ES3_D3D11(),
ES2_OPENGL(),
ES3_OPENGL());
ES3_OPENGL(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(D3D11TextureStreamSamplingTest, ES2_D3D11(), ES3_D3D11());
} // anonymous namespace
src/tests/egl_tests/EGLSurfacelessContextTest.cpp
......@@ -265,4 +265,8 @@ TEST_P(EGLSurfacelessContextTest, Switcheroo)
} // anonymous namespace
ANGLE_INSTANTIATE_TEST(EGLSurfacelessContextTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
ANGLE_INSTANTIATE_TEST(EGLSurfacelessContextTest,
ES2_D3D9(),
ES2_D3D11(),
ES2_OPENGL(),
ES2_VULKAN());
src/tests/gl_tests/BlendFuncExtendedTest.cpp
......@@ -592,7 +592,8 @@ ANGLE_INSTANTIATE_TEST(EXTBlendFuncExtendedTest,
ES2_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGL(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(EXTBlendFuncExtendedTestES3,
ES3_OPENGL(),
ES3_OPENGLES(),
......@@ -602,7 +603,8 @@ ANGLE_INSTANTIATE_TEST(EXTBlendFuncExtendedDrawTest,
ES2_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGL(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(EXTBlendFuncExtendedDrawTestES3,
ES3_OPENGL(),
ES3_OPENGLES(),
......
src/tests/gl_tests/CubeMapTextureTest.cpp
......@@ -59,6 +59,9 @@ class CubeMapTextureTest : public ANGLETest
// Verify that rendering to the faces of a cube map consecutively will correctly render to each face.
TEST_P(CubeMapTextureTest, RenderToFacesConsecutively)
{
// TODO: Diagnose and fix. http://anglebug.com/2954
ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsWindows());
const GLfloat faceColors[] =
{
1.0f, 0.0f, 0.0f, 1.0f,
......@@ -122,4 +125,5 @@ ANGLE_INSTANTIATE_TEST(CubeMapTextureTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
src/tests/gl_tests/D3DTextureTest.cpp
......@@ -1200,7 +1200,7 @@ TEST_P(D3DTextureTestMS, CopyTexSubImage2DTest)
// Use this to select which configurations (e.g. which renderer, which GLES major version) these
// tests should be run against.
ANGLE_INSTANTIATE_TEST(D3DTextureTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
ANGLE_INSTANTIATE_TEST(D3DTextureTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(D3DTextureTestES3, ES3_D3D11(), ES3_OPENGL());
ANGLE_INSTANTIATE_TEST(D3DTextureTestMS, ES2_D3D11());
} // namespace
src/tests/gl_tests/DXTSRGBCompressedTextureTest.cpp
......@@ -161,4 +161,5 @@ ANGLE_INSTANTIATE_TEST(DXTSRGBCompressedTextureTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
src/tests/gl_tests/DiscardFramebufferEXTTest.cpp
......@@ -118,4 +118,5 @@ ANGLE_INSTANTIATE_TEST(DiscardFramebufferEXTTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
src/tests/gl_tests/DrawBuffersTest.cpp
......@@ -644,7 +644,8 @@ ANGLE_INSTANTIATE_TEST(DrawBuffersTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(DrawBuffersWebGL2Test, ES3_D3D11(), ES3_OPENGL());
......
src/tests/gl_tests/ETCTextureTest.cpp
......@@ -266,5 +266,6 @@ ANGLE_INSTANTIATE_TEST(ETCTextureTest,
ES2_D3D11_FL9_3(),
ES3_D3D11(),
ES2_OPENGL(),
ES3_OPENGL());
ES3_OPENGL(),
ES2_VULKAN());
} // anonymous namespace
src/tests/gl_tests/ErrorMessages.cpp
......@@ -117,5 +117,6 @@ ANGLE_INSTANTIATE_TEST(ErrorMessagesTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
} // namespace
src/tests/gl_tests/ExplicitContextTest.cpp
......@@ -91,6 +91,11 @@ TEST_P(ExplicitContextTest, NullContext)
// Use this to select which configurations (e.g. which renderer, which GLES major version) these
// tests should be run against.
ANGLE_INSTANTIATE_TEST(ExplicitContextTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
ANGLE_INSTANTIATE_TEST(ExplicitContextTest,
ES2_D3D9(),
ES2_D3D11(),
ES2_OPENGL(),
ES2_OPENGLES(),
ES2_VULKAN());
} // namespace angle
src/tests/gl_tests/FenceSyncTests.cpp
......@@ -259,5 +259,6 @@ ANGLE_INSTANTIATE_TEST(FenceNVTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(FenceSyncTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
src/tests/gl_tests/FramebufferMixedSamplesTest.cpp
......@@ -273,4 +273,5 @@ TEST_P(CHROMIUMFramebufferMixedSamplesTest, MultisampleStencilEffective)
ANGLE_INSTANTIATE_TEST(CHROMIUMFramebufferMixedSamplesTest,
ES2_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGL());
ES3_OPENGL(),
ES2_VULKAN());
src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
......@@ -172,4 +172,5 @@ ANGLE_INSTANTIATE_TEST(FramebufferRenderMipmapTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
src/tests/gl_tests/GLSLTest.cpp
......@@ -5159,25 +5159,25 @@ ANGLE_INSTANTIATE_TEST(GLSLTest,
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_OPENGL(),
ES2_VULKAN(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(GLSLTestNoValidation,
ES2_D3D9(),
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_OPENGL(),
ES2_VULKAN(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
// Use this to select which configurations (e.g. which renderer, which GLES major version) these
// tests should be run against.
ANGLE_INSTANTIATE_TEST(GLSLTest_ES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
ANGLE_INSTANTIATE_TEST(WebGLGLSLTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
ANGLE_INSTANTIATE_TEST(WebGLGLSLTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(GLSLTest_ES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
src/tests/gl_tests/MultisampleCompatibilityTest.cpp
......@@ -288,7 +288,11 @@ TEST_P(EXTMultisampleCompatibilityTest, DrawAlphaOneAndResolve)
EXPECT_EQ(0, memcmp(results[0].get(), results[2].get(), kResultSize));
}
ANGLE_INSTANTIATE_TEST(EXTMultisampleCompatibilityTest, ES2_OPENGL(), ES2_OPENGLES(), ES3_OPENGL());
ANGLE_INSTANTIATE_TEST(EXTMultisampleCompatibilityTest,
ES2_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGL(),
ES2_VULKAN());
class MultisampleCompatibilityTest : public ANGLETest
{
......
src/tests/gl_tests/MultithreadingTest.cpp
......@@ -161,6 +161,7 @@ ANGLE_INSTANTIATE_TEST(MultithreadingTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
} // namespace angle
src/tests/gl_tests/PathRenderingTest.cpp
......@@ -1970,15 +1970,18 @@ ANGLE_INSTANTIATE_TEST(CHROMIUMPathRenderingTest,
ES2_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGL(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(CHROMIUMPathRenderingDrawTest,
ES2_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGL(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(CHROMIUMPathRenderingWithTexturingTest,
ES2_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGL(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
src/tests/gl_tests/ProgramBinaryTest.cpp
......@@ -252,7 +252,8 @@ ANGLE_INSTANTIATE_TEST(ProgramBinaryTest,
ES2_D3D11(),
ES3_D3D11(),
ES2_OPENGL(),
ES3_OPENGL());
ES3_OPENGL(),
ES2_VULKAN());
class ProgramBinaryES3Test : public ANGLETest
{
......
src/tests/gl_tests/RobustBufferAccessBehaviorTest.cpp
......@@ -336,6 +336,7 @@ ANGLE_INSTANTIATE_TEST(RobustBufferAccessBehaviorTest,
ES31_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES(),
ES31_OPENGLES());
ES31_OPENGLES(),
ES2_VULKAN());
} // namespace
src/tests/gl_tests/RobustClientMemoryTest.cpp
......@@ -412,6 +412,7 @@ ANGLE_INSTANTIATE_TEST(RobustClientMemoryTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
} // namespace
src/tests/gl_tests/SRGBFramebufferTest.cpp
......@@ -120,6 +120,7 @@ ANGLE_INSTANTIATE_TEST(SRGBFramebufferTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
} // namespace angle
src/tests/gl_tests/SRGBTextureTest.cpp
......@@ -356,6 +356,7 @@ ANGLE_INSTANTIATE_TEST(SRGBTextureTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
} // namespace
src/tests/gl_tests/SyncQueriesTest.cpp
......@@ -94,6 +94,7 @@ ANGLE_INSTANTIATE_TEST(SyncQueriesTest,
ES2_OPENGL(),
ES3_OPENGL(),
ES2_OPENGLES(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
} // namespace angle
src/tests/gl_tests/TextureRectangleTest.cpp
......@@ -453,7 +453,7 @@ TEST_P(TextureRectangleTestES3, CopyTexSubImage)
ASSERT_GL_NO_ERROR();
}
ANGLE_INSTANTIATE_TEST(TextureRectangleTest, ES2_OPENGL(), ES3_OPENGL());
ANGLE_INSTANTIATE_TEST(TextureRectangleTest, ES2_OPENGL(), ES3_OPENGL(), ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(TextureRectangleTestES3, ES3_OPENGL());
ANGLE_INSTANTIATE_TEST(TextureRectangleTestES31, ES31_OPENGL());
} // anonymous namespace
src/tests/gl_tests/TextureTest.cpp
......@@ -1322,6 +1322,9 @@ TEST_P(SamplerArrayTest, SamplerArrayDraw)
// user-defined function in the shader.
TEST_P(SamplerArrayAsFunctionParameterTest, SamplerArrayAsFunctionParameter)
{
// TODO: Diagnose and fix. http://anglebug.com/2955
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAndroid());
testSamplerArrayDraw();
}
......@@ -4308,19 +4311,22 @@ ANGLE_INSTANTIATE_TEST(Sampler2DAsFunctionParameterTest,
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(SamplerArrayTest,
ES2_D3D9(),
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(SamplerArrayAsFunctionParameterTest,
ES2_D3D9(),
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(Texture2DTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
ANGLE_INSTANTIATE_TEST(Texture3DTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
ANGLE_INSTANTIATE_TEST(Texture2DIntegerAlpha1TestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
......@@ -4340,36 +4346,42 @@ ANGLE_INSTANTIATE_TEST(SamplerInStructTest,
ES2_D3D11_FL9_3(),
ES2_D3D9(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(SamplerInStructAsFunctionParameterTest,
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_D3D9(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(SamplerInStructArrayAsFunctionParameterTest,
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_D3D9(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(SamplerInNestedStructAsFunctionParameterTest,
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_D3D9(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(SamplerInStructAndOtherVariableTest,
ES2_D3D11(),
ES2_D3D11_FL9_3(),
ES2_D3D9(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(TextureBorderClampTest,
ES2_D3D11(),
ES2_D3D9(),
ES2_OPENGL(),
ES2_OPENGLES());
ES2_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(TextureBorderClampTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
ANGLE_INSTANTIATE_TEST(TextureBorderClampIntegerTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
ANGLE_INSTANTIATE_TEST(TextureLimitsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN());
......
src/tests/gl_tests/WebGLFramebufferTest.cpp
......@@ -865,6 +865,7 @@ ANGLE_INSTANTIATE_TEST(WebGLFramebufferTest,
ES2_OPENGLES(),
ES3_D3D11(),
ES3_OPENGL(),
ES3_OPENGLES());
ES3_OPENGLES(),
ES2_VULKAN());
} // 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