Vulkan: enable as many end2end tests as possible

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -327,6 +327,9 @@ gl::Error FramebufferVk::blit(const gl::Context *context,
                               GLbitfield mask,
                               GLenum filter)
 {
+    // TODO(lucferron): Implement this
+    // Should enable the BlitFramebufferANGLETest tests in angle_end2end_tests
+    // http://anglebug.com/2643
     UNIMPLEMENTED();
     return gl::InternalError();
 }

src/tests/gl_tests/BindGeneratesResourceTest.cpp

@@ -118,6 +118,7 @@ ANGLE_INSTANTIATE_TEST(BindGeneratesResourceTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());
 
 }  // namespace

src/tests/gl_tests/BindUniformLocationTest.cpp

@@ -160,6 +160,10 @@ TEST_P(BindUniformLocationTest, Compositor)
 {
     ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_CHROMIUM_bind_uniform_location"));
 
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2642
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     ASSERT_NE(nullptr, mBindUniformLocation);
 
     const std::string vsSource =
@@ -596,7 +600,8 @@ ANGLE_INSTANTIATE_TEST(BindUniformLocationTest,
                        ES2_D3D11(),
                        ES2_D3D11_FL9_3(),
                        ES2_OPENGL(),
-                       ES2_OPENGLES());
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 
 ANGLE_INSTANTIATE_TEST(BindUniformLocationES31Test, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES())
 

src/tests/gl_tests/BlendMinMaxTest.cpp

@@ -195,4 +195,5 @@ ANGLE_INSTANTIATE_TEST(BlendMinMaxTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());

src/tests/gl_tests/BufferDataTest.cpp

@@ -475,6 +475,9 @@ TEST_P(BufferDataTestES3, NoBufferInitDataCopyBug)
     ASSERT_GL_NO_ERROR();
 }
 
+// TODO(lucferron): Diagnose and fix the Vulkan backend to enable the BufferDataTest tests.
+// http://anglebug.com/2644
+
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
 ANGLE_INSTANTIATE_TEST(BufferDataTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
 ANGLE_INSTANTIATE_TEST(BufferDataTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());

src/tests/gl_tests/ClientArraysTest.cpp

@@ -116,5 +116,6 @@ ANGLE_INSTANTIATE_TEST(ClientArraysTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());
 }  // namespace

src/tests/gl_tests/ColorMaskTest.cpp

@@ -87,6 +87,7 @@ ANGLE_INSTANTIATE_TEST(ColorMaskTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());
 
 }  // namespace angle

src/tests/gl_tests/CopyCompressedTextureTest.cpp

@@ -356,6 +356,7 @@ ANGLE_INSTANTIATE_TEST(CopyCompressedTextureTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());
 
 }  // namespace angle

src/tests/gl_tests/CopyTextureTest.cpp

@@ -1589,8 +1589,18 @@ TEST_P(CopyTextureTestES3, ES3UintFormats)
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against.
-ANGLE_INSTANTIATE_TEST(CopyTextureTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
-ANGLE_INSTANTIATE_TEST(CopyTextureTestWebGL, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
+ANGLE_INSTANTIATE_TEST(CopyTextureTest,
+                       ES2_D3D9(),
+                       ES2_D3D11(),
+                       ES2_OPENGL(),
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
+ANGLE_INSTANTIATE_TEST(CopyTextureTestWebGL,
+                       ES2_D3D9(),
+                       ES2_D3D11(),
+                       ES2_OPENGL(),
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(CopyTextureTestDest, ES2_D3D11());
 ANGLE_INSTANTIATE_TEST(CopyTextureTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 

src/tests/gl_tests/D3DImageFormatConversionTest.cpp

@@ -153,6 +153,11 @@ TEST_P(D3DImageFormatConversionTest, WriteColorFunctionR8G8B8)
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
 // Even though this test is only run on Windows (since it includes imageformats.h from the D3D renderer), we can still run the test
 // against OpenGL. This is valuable, since it provides extra validation using a renderer that doesn't use imageformats.h itself.
-ANGLE_INSTANTIATE_TEST(D3DImageFormatConversionTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES2_OPENGL());
+ANGLE_INSTANTIATE_TEST(D3DImageFormatConversionTest,
+                       ES2_D3D9(),
+                       ES2_D3D11(),
+                       ES2_D3D11_FL9_3(),
+                       ES2_OPENGL(),
+                       ES2_VULKAN());
 
 } // namespace

src/tests/gl_tests/DebugMarkerTest.cpp

@@ -62,6 +62,11 @@ TEST_P(DebugMarkerTest, BasicValidation)
 }
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_INSTANTIATE_TEST(DebugMarkerTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
+ANGLE_INSTANTIATE_TEST(DebugMarkerTest,
+                       ES2_D3D9(),
+                       ES2_D3D11(),
+                       ES2_OPENGL(),
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 
 } // namespace

src/tests/gl_tests/DebugTest.cpp

@@ -410,6 +410,7 @@ ANGLE_INSTANTIATE_TEST(DebugTest,
                        ES2_D3D11(),
                        ES3_D3D11(),
                        ES2_OPENGL(),
-                       ES3_OPENGL());
+                       ES3_OPENGL(),
+                       ES2_VULKAN());
 
 }  // namespace angle

src/tests/gl_tests/ImageTest.cpp

@@ -1797,6 +1797,7 @@ ANGLE_INSTANTIATE_TEST(ImageTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(ImageTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 }

src/tests/gl_tests/IndexBufferOffsetTest.cpp

@@ -118,6 +118,10 @@ class IndexBufferOffsetTest : public ANGLETest
 // Test using an offset for an UInt8 index buffer
 TEST_P(IndexBufferOffsetTest, UInt8Index)
 {
+    // TODO(lucferron): Add support for unsigned byte elements array buffers
+    // http://anglebug.com/2659
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     GLubyte indexData[] = {0, 1, 2, 1, 2, 3};
     runTest(GL_UNSIGNED_BYTE, 1, indexData);
 }
@@ -125,6 +129,10 @@ TEST_P(IndexBufferOffsetTest, UInt8Index)
 // Test using an offset for an UInt16 index buffer
 TEST_P(IndexBufferOffsetTest, UInt16Index)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2645
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     GLushort indexData[] = {0, 1, 2, 1, 2, 3};
     runTest(GL_UNSIGNED_SHORT, 2, indexData);
 }
@@ -146,4 +154,5 @@ ANGLE_INSTANTIATE_TEST(IndexBufferOffsetTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());

src/tests/gl_tests/IndexedPointsTest.cpp

@@ -375,6 +375,9 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset3)
     runTest(3, false);
 }
 
+// TODO(lucferron): Diagnose and fix the UByte and UShort tests below for Vulkan.
+// http://anglebug.com/2646
+
 // TODO(geofflang): Figure out why this test fails on Intel OpenGL
 ANGLE_INSTANTIATE_TEST(IndexedPointsTestUByte,
                        ES2_D3D11(),
@@ -390,4 +393,5 @@ ANGLE_INSTANTIATE_TEST(IndexedPointsTestUInt,
                        ES2_D3D11(),
                        ES2_D3D11_FL9_3(),
                        ES2_OPENGL(),
-                       ES2_OPENGLES());
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
\ No newline at end of file

src/tests/gl_tests/InstancingTest.cpp

@@ -296,6 +296,8 @@ class InstancingTestPoints : public InstancingTest
 // to D3D, to ensure that slot/stream zero of the input layout doesn't contain per-instance data.
 TEST_P(InstancingTestAllConfigs, AttributeZeroInstanced)
 {
+    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_ANGLE_instanced_arrays"));
+
     const std::string vs =
         "attribute vec3 a_instancePos;\n"
         "attribute vec3 a_position;\n"
@@ -312,6 +314,7 @@ TEST_P(InstancingTestAllConfigs, AttributeZeroInstanced)
 // expected.
 TEST_P(InstancingTestAllConfigs, AttributeZeroNotInstanced)
 {
+    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_ANGLE_instanced_arrays"));
     const std::string vs =
         "attribute vec3 a_position;\n"
         "attribute vec3 a_instancePos;\n"
@@ -528,6 +531,9 @@ TEST_P(InstancingTestES31, UpdateAttribBindingByVertexAttribDivisor)
     glDeleteVertexArrays(1, &vao);
 }
 
+// TODO(lucferron): Diagnose and fix InstancingTestAllConfigs for Vulkan.
+// http://anglebug.com/2647
+
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against. We test on D3D9 and D3D11 9_3 because they use special codepaths
 // when attribute zero is instanced, unlike D3D11.

src/tests/gl_tests/LinkAndRelinkTest.cpp

@@ -62,6 +62,10 @@ TEST_P(LinkAndRelinkTest, RenderingProgramFailsWithoutProgramInstalled)
 // However, dispatching compute always fails.
 TEST_P(LinkAndRelinkTest, RenderingProgramFailsWithProgramInstalled)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2648
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     // Install a render program in current GL state via UseProgram, then render.
     // It should succeed.
     const std::string vsSource =
@@ -434,7 +438,8 @@ ANGLE_INSTANTIATE_TEST(LinkAndRelinkTest,
                        ES2_D3D11(),
                        ES3_OPENGL(),
                        ES3_OPENGLES(),
-                       ES3_D3D11());
+                       ES3_D3D11(),
+                       ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(LinkAndRelinkTestES31, ES31_OPENGL(), ES31_OPENGLES());
 
 }  // namespace

src/tests/gl_tests/MaxTextureSizeTest.cpp

@@ -288,4 +288,8 @@ TEST_P(MaxTextureSizeTest, RenderToTexture)
 // default framebuffer is BGRA to enable the GL and GLES backends. (http://anglebug.com/1289)
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_INSTANTIATE_TEST(MaxTextureSizeTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3());
+ANGLE_INSTANTIATE_TEST(MaxTextureSizeTest,
+                       ES2_D3D9(),
+                       ES2_D3D11(),
+                       ES2_D3D11_FL9_3(),
+                       ES2_VULKAN());

src/tests/gl_tests/MultisampleCompatibilityTest.cpp

@@ -414,4 +414,5 @@ ANGLE_INSTANTIATE_TEST(MultisampleCompatibilityTest,
                        ES2_OPENGLES(),
                        ES3_D3D11(),
                        ES3_OPENGL(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());

src/tests/gl_tests/ReadPixelsTest.cpp

@@ -711,7 +711,7 @@ TEST_P(ReadPixelsErrorTest, ReadBufferIsNone)
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against.
-ANGLE_INSTANTIATE_TEST(ReadPixelsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
+ANGLE_INSTANTIATE_TEST(ReadPixelsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(ReadPixelsPBOTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 ANGLE_INSTANTIATE_TEST(ReadPixelsPBODrawTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 ANGLE_INSTANTIATE_TEST(ReadPixelsMultisampleTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());

src/tests/gl_tests/SixteenBppTextureTest.cpp

@@ -149,6 +149,9 @@ class SixteenBppTextureTestES3 : public SixteenBppTextureTest
 // Samples from the texture, renders to it, generates mipmaps etc.
 TEST_P(SixteenBppTextureTest, RGB565Validation)
 {
+    // TODO(lucferron): Diagnose and fix http://anglebug.com/2656
+    ANGLE_SKIP_TEST_IF(IsVulkan() && (IsAndroid() || (IsWindows() && IsIntel())));
+
     GLuint test;
     memcpy(&test, &GLColor::black, 4);
 
@@ -176,6 +179,10 @@ TEST_P(SixteenBppTextureTest, RGB565Validation)
 // Samples from the texture, renders to it, generates mipmaps etc.
 TEST_P(SixteenBppTextureTest, RGBA5551Validation)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2649
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     GLushort pixels[4] =
     {
         0xF801, // Red
@@ -202,6 +209,10 @@ TEST_P(SixteenBppTextureTest, RGBA5551Validation)
 // Based on WebGL test conformance/textures/texture-attachment-formats.html
 TEST_P(SixteenBppTextureTest, RGBA5551ClearAlpha)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2649
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     GLTexture tex;
     GLFramebuffer fbo;
 
@@ -494,7 +505,8 @@ ANGLE_INSTANTIATE_TEST(SixteenBppTextureTest,
                        ES2_D3D11(),
                        ES2_D3D11_FL9_3(),
                        ES2_OPENGL(),
-                       ES2_OPENGLES());
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 
 ANGLE_INSTANTIATE_TEST(SixteenBppTextureTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 

src/tests/gl_tests/StateChangeTest.cpp

@@ -160,6 +160,10 @@ TEST_P(StateChangeTest, FramebufferIncompleteWithTexStorage)
 {
     ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_storage"));
 
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2651
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
@@ -232,6 +236,10 @@ TEST_P(StateChangeTest, FramebufferIncompleteDepthAttachment)
 // Test that Framebuffer completeness caching works when stencil attachments change.
 TEST_P(StateChangeTest, FramebufferIncompleteStencilAttachment)
 {
+    // TODO(lucferron): Figure out why this fails on android and Intel/Windows and fix.
+    // http://anglebug.com/2655
+    ANGLE_SKIP_TEST_IF(IsVulkan() && (IsAndroid() || (IsIntel() && IsWindows())));
+
     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
@@ -296,6 +304,10 @@ void main()
 // Tests that using a buffered attribute, then disabling it and using current value, works.
 TEST_P(StateChangeTest, DisablingBufferedVertexAttribute)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2650
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     ANGLE_GL_PROGRAM(program, kSimpleAttributeVS, kSimpleAttributeFS);
     glUseProgram(program);
     GLint attribLoc   = glGetAttribLocation(program, "testAttrib");
@@ -604,6 +616,10 @@ TEST_P(StateChangeRenderTest, RecreateRenderbuffer)
 // Test that recreating a texture with GenerateMipmaps signals the FBO is dirty.
 TEST_P(StateChangeRenderTest, GenerateMipmap)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2652
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
 
     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
@@ -2041,7 +2057,7 @@ TEST_P(SimpleStateChangeTest, ReleaseShaderInUseThatReadsFromUniforms)
 
 }  // anonymous namespace
 
-ANGLE_INSTANTIATE_TEST(StateChangeTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
+ANGLE_INSTANTIATE_TEST(StateChangeTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(LineLoopStateChangeTest,
                        ES2_D3D9(),
                        ES2_D3D11(),
@@ -2051,6 +2067,7 @@ ANGLE_INSTANTIATE_TEST(StateChangeRenderTest,
                        ES2_D3D9(),
                        ES2_D3D11(),
                        ES2_OPENGL(),
-                       ES2_D3D11_FL9_3());
+                       ES2_D3D11_FL9_3(),
+                       ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(StateChangeTestES3, ES3_D3D11(), ES3_OPENGL());
 ANGLE_INSTANTIATE_TEST(SimpleStateChangeTest, ES2_VULKAN(), ES2_OPENGL());

src/tests/gl_tests/TextureTest.cpp

@@ -1339,6 +1339,10 @@ TEST_P(SamplerArrayAsFunctionParameterTest, SamplerArrayAsFunctionParameter)
 // Copy of a test in conformance/textures/texture-mips, to test generate mipmaps
 TEST_P(Texture2DTestWithDrawScale, MipmapsTwice)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2653
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     int px = getWindowWidth() / 2;
     int py = getWindowHeight() / 2;
 
@@ -1381,6 +1385,9 @@ TEST_P(Texture2DTestWithDrawScale, MipmapsTwice)
 // https://code.google.com/p/angleproject/issues/detail?id=849
 TEST_P(TextureCubeTest, CubeMapFBO)
 {
+    // TODO(jmadill): Cube map render targets. http://anglebug.com/2470
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     GLuint fbo;
     glGenFramebuffers(1, &fbo);
     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
@@ -2933,6 +2940,10 @@ TEST_P(TextureLimitsTest, MaxFragmentTextures)
 // Test rendering with maximum combined texture units.
 TEST_P(TextureLimitsTest, MaxCombinedTextures)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2654
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     GLint vertexTextures = mMaxVertexTextures;
 
     if (vertexTextures + mMaxFragmentTextures > mMaxCombinedTextures)
@@ -2967,6 +2978,10 @@ TEST_P(TextureLimitsTest, ExcessiveFragmentTextures)
 // Test active vertex textures under the limit, but excessive textures specified.
 TEST_P(TextureLimitsTest, MaxActiveVertexTextures)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2654
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     compileProgramWithTextureCounts("tex", mMaxVertexTextures + 4, mMaxVertexTextures, "tex", 0, 0);
     ASSERT_NE(0u, mProgram);
     ASSERT_GL_NO_ERROR();
@@ -2977,6 +2992,10 @@ TEST_P(TextureLimitsTest, MaxActiveVertexTextures)
 // Test active fragment textures under the limit, but excessive textures specified.
 TEST_P(TextureLimitsTest, MaxActiveFragmentTextures)
 {
+    // TODO(lucferron): Diagnose and fix
+    // http://anglebug.com/2654
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     compileProgramWithTextureCounts("tex", 0, 0, "tex", mMaxFragmentTextures + 4,
                                     mMaxFragmentTextures);
     ASSERT_NE(0u, mProgram);
@@ -3757,13 +3776,15 @@ ANGLE_INSTANTIATE_TEST(TextureCubeTest,
                        ES2_D3D11_FL10_0(),
                        ES2_D3D11_FL9_3(),
                        ES2_OPENGL(),
-                       ES2_OPENGLES());
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(Texture2DTestWithDrawScale,
                        ES2_D3D9(),
                        ES2_D3D11(),
                        ES2_D3D11_FL9_3(),
                        ES2_OPENGL(),
-                       ES2_OPENGLES());
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(Sampler2DAsFunctionParameterTest,
                        ES2_D3D9(),
                        ES2_D3D11(),
@@ -3826,7 +3847,7 @@ ANGLE_INSTANTIATE_TEST(SamplerInStructAndOtherVariableTest,
                        ES2_D3D9(),
                        ES2_OPENGL(),
                        ES2_OPENGLES());
-ANGLE_INSTANTIATE_TEST(TextureLimitsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
+ANGLE_INSTANTIATE_TEST(TextureLimitsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(Texture2DNorm16TestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 ANGLE_INSTANTIATE_TEST(TextureCubeTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 

src/tests/gl_tests/TextureUploadFormatTest.cpp

@@ -303,6 +303,9 @@ std::string EnumStr(const GLenum v)
 // Test all internalFormat/unpackFormat/unpackType combinations from ES3.0.
 TEST_P(TextureUploadFormatTest, All)
 {
+    // TODO(lucferron): Diagnose and fix http://anglebug.com/2657
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAndroid());
+
     ANGLE_SKIP_TEST_IF(IsD3D9() || IsD3D11_FL93());
 
     constexpr char kVertShaderES2[]     = R"(
@@ -773,4 +776,5 @@ ANGLE_INSTANTIATE_TEST(TextureUploadFormatTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());

src/tests/gl_tests/UniformTest.cpp

@@ -778,6 +778,9 @@ TEST_P(UniformTestES3, OverflowArray)
 // Check setting a sampler uniform
 TEST_P(UniformTest, Sampler)
 {
+    // TODO(jmadill): Implement sampler arrays. http://anglebug.com/2462
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     const std::string &vertShader =
         "uniform sampler2D tex2D;\n"
         "void main() {\n"
@@ -1269,7 +1272,8 @@ ANGLE_INSTANTIATE_TEST(UniformTest,
                        ES2_D3D11(),
                        ES2_D3D11_FL9_3(),
                        ES2_OPENGL(),
-                       ES2_OPENGLES());
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 ANGLE_INSTANTIATE_TEST(UniformTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 ANGLE_INSTANTIATE_TEST(UniformTestES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
 

src/tests/gl_tests/UnpackRowLength.cpp

@@ -112,6 +112,7 @@ ANGLE_INSTANTIATE_TEST(UnpackRowLengthTest,
                        ES2_OPENGL(),
                        ES3_OPENGL(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());
 
 } // namespace

src/tests/gl_tests/ViewportTest.cpp

@@ -249,6 +249,7 @@ ANGLE_INSTANTIATE_TEST(ViewportTest,
                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE),
                        ES2_D3D11_FL9_3(),
                        ES2_OPENGLES(),
-                       ES3_OPENGLES());
+                       ES3_OPENGLES(),
+                       ES2_VULKAN());
 
 } // namespace