diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 01:33:11 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 01:33:11 +0000 |
| commit | 9b5affb596bf7041776cf9ae5cb03c35d223d5b7 (patch) | |
| tree | 25902a3e8f22007f76a9e6dd91c16d2599316b51 /ui/surface | |
| parent | 53583ad00e93255e66a90dc06b1bb0e251db9660 (diff) | |
| download | chromium_src-9b5affb596bf7041776cf9ae5cb03c35d223d5b7.zip chromium_src-9b5affb596bf7041776cf9ae5cb03c35d223d5b7.tar.gz chromium_src-9b5affb596bf7041776cf9ae5cb03c35d223d5b7.tar.bz2 | |
Roll ANGLE 1046:1164.
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/10668003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/surface')
| -rw-r--r-- | ui/surface/accelerated_surface_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc index 3f41130..1bc0cb5 100644 --- a/ui/surface/accelerated_surface_win.cc +++ b/ui/surface/accelerated_surface_win.cc @@ -753,7 +753,7 @@ void AcceleratedPresenter::DoPresentAndAcknowledge( { TRACE_EVENT0("gpu", "Copy"); - if (reverse_rows_) { + if (!reverse_rows_) { // Use a simple pixel / vertex shader pair to render a quad that flips the // source texture on the vertical axis. IDirect3DSurface9 *default_render_target = NULL; |