Commit 6b695c3f by Jamie Madill Committed by Commit Bot

Vulkan: Enable WebGLCompatiblityTest.

Contains several useful tests including some that cover bugs with compressed texture support. And some uses of CopyTexImage. Bug: angleproject:2904 Bug: angleproject:2914 Change-Id: I90398ce2c513ace07cb9d414cd9a65c79e63aadb Reviewed-on: https://chromium-review.googlesource.com/c/1462058 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 00f43c91
...@@ -1407,11 +1407,13 @@ void WebGLCompatibilityTest::TestDifferentStencilMaskAndRef(GLenum errIfMismatch ...@@ -1407,11 +1407,13 @@ void WebGLCompatibilityTest::TestDifferentStencilMaskAndRef(GLenum errIfMismatch
glDrawArrays(GL_TRIANGLES, 0, 6); glDrawArrays(GL_TRIANGLES, 0, 6);
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
} }
TEST_P(WebGLCompatibilityTest, StencilTestEnabledDisallowsDifferentStencilMaskAndRef) TEST_P(WebGLCompatibilityTest, StencilTestEnabledDisallowsDifferentStencilMaskAndRef)
{ {
glEnable(GL_STENCIL_TEST); glEnable(GL_STENCIL_TEST);
TestDifferentStencilMaskAndRef(GL_INVALID_OPERATION); TestDifferentStencilMaskAndRef(GL_INVALID_OPERATION);
} }
TEST_P(WebGLCompatibilityTest, StencilTestDisabledAllowsDifferentStencilMaskAndRef) TEST_P(WebGLCompatibilityTest, StencilTestDisabledAllowsDifferentStencilMaskAndRef)
{ {
glDisable(GL_STENCIL_TEST); glDisable(GL_STENCIL_TEST);
...@@ -2395,6 +2397,9 @@ TEST_P(WebGLCompatibilityTest, RenderingFeedbackLoopWithDrawBuffersEXT) ...@@ -2395,6 +2397,9 @@ TEST_P(WebGLCompatibilityTest, RenderingFeedbackLoopWithDrawBuffersEXT)
// Based on the WebGL test conformance/textures/misc/texture-copying-feedback-loops.html // Based on the WebGL test conformance/textures/misc/texture-copying-feedback-loops.html
TEST_P(WebGLCompatibilityTest, TextureCopyingFeedbackLoops) TEST_P(WebGLCompatibilityTest, TextureCopyingFeedbackLoops)
{ {
// Vulkan does not support copying from a texture to itself. http://anglebug.com/2914
ANGLE_SKIP_TEST_IF(IsVulkan());
GLTexture texture; GLTexture texture;
glBindTexture(GL_TEXTURE_2D, texture.get()); glBindTexture(GL_TEXTURE_2D, texture.get());
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
...@@ -2524,6 +2529,9 @@ TEST_P(WebGLCompatibilityTest, GlobalNamesConflict) ...@@ -2524,6 +2529,9 @@ TEST_P(WebGLCompatibilityTest, GlobalNamesConflict)
// Test dimension and image size validation of compressed textures // Test dimension and image size validation of compressed textures
TEST_P(WebGLCompatibilityTest, CompressedTextureS3TC) TEST_P(WebGLCompatibilityTest, CompressedTextureS3TC)
{ {
// Missing compressed Texture support. http://anglebug.com/2904
ANGLE_SKIP_TEST_IF(IsVulkan());
if (extensionRequestable("GL_EXT_texture_compression_dxt1")) if (extensionRequestable("GL_EXT_texture_compression_dxt1"))
{ {
glRequestExtensionANGLE("GL_EXT_texture_compression_dxt1"); glRequestExtensionANGLE("GL_EXT_texture_compression_dxt1");
...@@ -4111,6 +4119,9 @@ void WebGLCompatibilityTest::validateCompressedTexImageExtensionFormat(GLenum fo ...@@ -4111,6 +4119,9 @@ void WebGLCompatibilityTest::validateCompressedTexImageExtensionFormat(GLenum fo
const std::string &extName, const std::string &extName,
bool subImageAllowed) bool subImageAllowed)
{ {
// Missing compressed Texture support. http://anglebug.com/2904
ANGLE_SKIP_TEST_IF(IsVulkan());
std::vector<GLubyte> data(blockSize, 0u); std::vector<GLubyte> data(blockSize, 0u);
GLTexture texture; GLTexture texture;
...@@ -4348,7 +4359,8 @@ ANGLE_INSTANTIATE_TEST(WebGLCompatibilityTest, ...@@ -4348,7 +4359,8 @@ ANGLE_INSTANTIATE_TEST(WebGLCompatibilityTest,
ES2_OPENGL(), ES2_OPENGL(),
ES3_OPENGL(), ES3_OPENGL(),
ES2_OPENGLES(), ES2_OPENGLES(),
ES3_OPENGLES()); ES3_OPENGLES(),
ES2_VULKAN());
ANGLE_INSTANTIATE_TEST(WebGL2CompatibilityTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES()); ANGLE_INSTANTIATE_TEST(WebGL2CompatibilityTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
} // 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