diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 19:39:04 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 19:39:04 +0000 |
commit | 3208c5236f0b0f83afdc60e13337769f07c3a9c0 (patch) | |
tree | 077c7f8e7a2a56e1cea2ccda5a143ce9e62a8e87 /gpu | |
parent | 2b4922836f6933efabf6bd50c2006e1e1bf1a16e (diff) | |
download | chromium_src-3208c5236f0b0f83afdc60e13337769f07c3a9c0.zip chromium_src-3208c5236f0b0f83afdc60e13337769f07c3a9c0.tar.gz chromium_src-3208c5236f0b0f83afdc60e13337769f07c3a9c0.tar.bz2 |
Roll ANGLE 1046:1168.
Suppressed regressing WebGL conformance tests.
Removed check for alpha==1 for a depth texture because I think GL_ANGLE_depth_texture is specified such that this is not expected.
The roll causes the image transport to be flipped. Compensated in AcceleratedSurface.
BUG=134743
Review URL: https://chromiumcodereview.appspot.com/10702010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r-- | gpu/command_buffer/tests/gl_depth_texture_unittest.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc index 9663340..c7365ad 100644 --- a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc +++ b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc @@ -180,7 +180,6 @@ TEST_F(DepthTextureTest, RenderTo) { EXPECT_EQ(actual[0], actual[1]); EXPECT_EQ(actual[1], actual[2]); - EXPECT_EQ(0xFF, actual[3]); if (xx > 0) { EXPECT_GT(actual[0], left[0]); |