Revert "Enable TexSubImage workaround on D3D11."
Probably causing WebGL CTS failures:
http://build.chromium.org/p/chromium.gpu.fyi/builders/Win8%20Release%20%28NVIDIA%29/builds/6148
This reverts commit 2d337ce0503db5f91fcf0a11591cd436dfb32cd7.
Change-Id: Ic032640f44adf337c4b3eedd4d7f3551d565a5cb
Reviewed-on: https://chromium-review.googlesource.com/221397
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
diff --git a/tests/angle_tests/TextureTest.cpp b/tests/angle_tests/TextureTest.cpp
index aeee84e..1213972 100644
--- a/tests/angle_tests/TextureTest.cpp
+++ b/tests/angle_tests/TextureTest.cpp
@@ -40,11 +40,9 @@
attribute vec4 position;
varying vec2 texcoord;
- uniform vec2 textureScale;
-
void main()
{
- gl_Position = vec4(position.xy * textureScale, 0.0, 1.0);
+ gl_Position = position;
texcoord = (position.xy * 0.5) + 0.5;
}
);
@@ -83,15 +81,6 @@
}
mTexture2DUniformLocation = glGetUniformLocation(m2DProgram, "tex");
- ASSERT_NE(-1, mTexture2DUniformLocation);
-
- mTextureScaleUniformLocation = glGetUniformLocation(m2DProgram, "textureScale");
- ASSERT_NE(-1, mTextureScaleUniformLocation);
-
- glUseProgram(m2DProgram);
- glUniform2f(mTextureScaleUniformLocation, 1.0f, 1.0f);
- glUseProgram(0);
- ASSERT_GL_NO_ERROR();
}
virtual void TearDown()
@@ -110,7 +99,6 @@
GLuint m2DProgram;
GLuint mCubeProgram;
GLint mTexture2DUniformLocation;
- GLint mTextureScaleUniformLocation;
};
TYPED_TEST(TextureTest, NegativeAPISubImage)
@@ -164,63 +152,3 @@
drawQuad(mCubeProgram, "position", 0.5f);
EXPECT_GL_NO_ERROR();
}
-
-// Copy of a test in conformance/textures/texture-mips, to test generate mipmaps
-TYPED_TEST(TextureTest, MipmapsTwice)
-{
- int px = getWindowWidth() / 2;
- int py = getWindowHeight() / 2;
-
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, mTexture2D);
-
- // Fill with red
- std::vector<GLubyte> pixels(4 * 16 * 16);
- for (size_t pixelId = 0; pixelId < 16 * 16; ++pixelId)
- {
- pixels[pixelId * 4 + 0] = 255;
- pixels[pixelId * 4 + 1] = 0;
- pixels[pixelId * 4 + 2] = 0;
- pixels[pixelId * 4 + 3] = 255;
- }
-
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels.data());
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glGenerateMipmap(GL_TEXTURE_2D);
-
- glUseProgram(m2DProgram);
- glUniform1i(mTexture2DUniformLocation, 0);
- glUniform2f(mTextureScaleUniformLocation, 0.0625f, 0.0625f);
- drawQuad(m2DProgram, "position", 0.5f);
- EXPECT_GL_NO_ERROR();
- EXPECT_PIXEL_EQ(px, py, 255, 0, 0, 255);
-
- // Fill with blue
- for (size_t pixelId = 0; pixelId < 16 * 16; ++pixelId)
- {
- pixels[pixelId * 4 + 0] = 0;
- pixels[pixelId * 4 + 1] = 0;
- pixels[pixelId * 4 + 2] = 255;
- pixels[pixelId * 4 + 3] = 255;
- }
-
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels.data());
- glGenerateMipmap(GL_TEXTURE_2D);
-
- // Fill with green
- for (size_t pixelId = 0; pixelId < 16 * 16; ++pixelId)
- {
- pixels[pixelId * 4 + 0] = 0;
- pixels[pixelId * 4 + 1] = 255;
- pixels[pixelId * 4 + 2] = 0;
- pixels[pixelId * 4 + 3] = 255;
- }
-
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels.data());
- glGenerateMipmap(GL_TEXTURE_2D);
-
- drawQuad(m2DProgram, "position", 0.5f);
- EXPECT_GL_NO_ERROR();
- EXPECT_PIXEL_EQ(px, py, 0, 255, 0, 255);
-}