Disable MipMapTests on all renderers.
Change-Id: Ic229ced16f667882521536db5bd483c76b24d600
Reviewed-on: https://chromium-review.googlesource.com/242905
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/tests/angle_tests/MipmapTest.cpp b/tests/angle_tests/MipmapTest.cpp
index c88ca72..caf2c89 100644
--- a/tests/angle_tests/MipmapTest.cpp
+++ b/tests/angle_tests/MipmapTest.cpp
@@ -1,7 +1,7 @@
#include "ANGLETest.h"
// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_TYPED_TEST_CASE(MipmapTest, ES2_D3D9, ES2_D3D11);
+ANGLE_TYPED_TEST_CASE(MipmapTest, ES2_D3D9, ES2_D3D11, ES2_D3D11_FL9_3);
ANGLE_TYPED_TEST_CASE(MipmapTestES3, ES3_D3D11);
template<typename T>
@@ -414,7 +414,7 @@
// To do this, D3D11 has to convert the TextureStorage into a renderable one.
// This test ensures that the conversion works correctly.
// In particular, on D3D11 Feature Level 9_3 it ensures that both the zero LOD workaround texture AND the 'normal' texture are copied during conversion.
-TYPED_TEST(MipmapTest, GenerateMipmapFromInitDataThenRender)
+TYPED_TEST(MipmapTest, DISABLED_GenerateMipmapFromInitDataThenRender)
{
// Pass in initial data so the texture is blue.
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE, mLevelZeroBlueInitData);
@@ -469,7 +469,7 @@
// This test ensures that mips are correctly generated from a rendered image.
// In particular, on D3D11 Feature Level 9_3, the clear call will be performed on the zero-level texture, rather than the mipped one.
// The test ensures that the zero-level texture is correctly copied into the mipped texture before the mipmaps are generated.
-TYPED_TEST(MipmapTest, GenerateMipmapFromRenderedImage)
+TYPED_TEST(MipmapTest, DISABLED_GenerateMipmapFromRenderedImage)
{
// Bind the offscreen framebuffer/texture.
glBindFramebuffer(GL_FRAMEBUFFER, mOffscreenFramebuffer);
@@ -500,7 +500,7 @@
// Test to ensure that rendering to a mipmapped texture works, regardless of whether mipmaps are enabled or not.
// TODO: This test hits a texture rebind bug in the D3D11 renderer. Fix this.
-TYPED_TEST(MipmapTest, RenderOntoLevelZeroAfterGenerateMipmap)
+TYPED_TEST(MipmapTest, DISABLED_RenderOntoLevelZeroAfterGenerateMipmap)
{
// Bind the offscreen texture/framebuffer.
glBindFramebuffer(GL_FRAMEBUFFER, mOffscreenFramebuffer);
@@ -569,7 +569,7 @@
// This test ensures that the level-zero workaround for TextureCubes (on D3D11 Feature Level 9_3)
// works as expected. It tests enabling/disabling mipmaps, generating mipmaps, and rendering to level zero.
-TYPED_TEST(MipmapTest, TextureCubeGeneralLevelZero)
+TYPED_TEST(MipmapTest, DISABLED_TextureCubeGeneralLevelZero)
{
GLfloat vertexLocations[] =
{
@@ -645,7 +645,7 @@
}
// This test ensures that rendering to level-zero of a TextureCube works as expected.
-TYPED_TEST(MipmapTest, TextureCubeRenderToLevelZero)
+TYPED_TEST(MipmapTest, DISABLED_TextureCubeRenderToLevelZero)
{
GLfloat vertexLocations[] =
{
@@ -699,7 +699,7 @@
// Creates a mipmapped 2D array texture with three layers, and calls ANGLE's GenerateMipmap.
// Then tests if the mipmaps are rendered correctly for all three layers.
-TYPED_TEST(MipmapTestES3, MipmapsForTextureArray)
+TYPED_TEST(MipmapTestES3, DISABLED_MipmapsForTextureArray)
{
int px = getWindowWidth() / 2;
int py = getWindowHeight() / 2;