summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-10 18:09:25 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-10 18:09:25 +0000
commitdd90b3e0c8f39216e586f8a2efcea61c71b622bb (patch)
tree021c95acbdf63fcdd38fbd3e6b10446169565e32 /gpu/command_buffer
parent7ea8bc575c402205205a085411c666d222e239fa (diff)
downloadchromium_src-dd90b3e0c8f39216e586f8a2efcea61c71b622bb.zip
chromium_src-dd90b3e0c8f39216e586f8a2efcea61c71b622bb.tar.gz
chromium_src-dd90b3e0c8f39216e586f8a2efcea61c71b622bb.tar.bz2
re-enable depth texture gl test
Ran in on Windows. It worked here. Not sure why it failed on bots a week ago. BUG=135229 TEST=it IS a test Review URL: https://chromiumcodereview.appspot.com/10748014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
-rw-r--r--gpu/command_buffer/tests/gl_depth_texture_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc
index 3cdddfb..e7a01aae 100644
--- a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc
+++ b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc
@@ -60,9 +60,7 @@ struct FormatType {
} // anonymous namespace
-// Temporarily marked disabled due to failure on gpu bots.
-// https://code.google.com/p/chromium/issues/detail?id=135229
-TEST_F(DepthTextureTest, DISABLED_RenderTo) {
+TEST_F(DepthTextureTest, RenderTo) {
if (!GLTestHelper::HasExtension("GL_CHROMIUM_depth_texture")) {
return;
}
@@ -189,6 +187,8 @@ TEST_F(DepthTextureTest, DISABLED_RenderTo) {
if (yy > 0) {
EXPECT_GT(actual[0], down[0]);
}
+
+ EXPECT_TRUE(actual[3] == actual[0] || actual[3] == 0xFF);
}
}