diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 00:54:25 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 00:54:25 +0000 |
| commit | 744329cf9801e052f15c9697c3fcf57e7a3169b4 (patch) | |
| tree | 92d17439d43862570ac6357c283f82ff8c829e99 /gpu/GLES2 | |
| parent | 36a3cd62844159f91f542ae3657dd0ac24d7f5af (diff) | |
| download | chromium_src-744329cf9801e052f15c9697c3fcf57e7a3169b4.zip chromium_src-744329cf9801e052f15c9697c3fcf57e7a3169b4.tar.gz chromium_src-744329cf9801e052f15c9697c3fcf57e7a3169b4.tar.bz2 | |
Revert 210138 "Perform glReadPixels with PBOs in the gpu, if PBO..."
> Perform glReadPixels with PBOs in the gpu, if PBOs are available.
> Make GL_ASYNC_READ_PIXELS_COMPLETED_CHROMIUM wait for readpixel transfers.
> PLEASE NOTE: glMapBuffer does not wait for the readpixels transfer to complete anymore.
> Nobody is currently relying on that behaviour.
> Update gl_helper.cc and gl_renderer.cc to use queries.
>
> This CL is the same as https://codereview.chromium.org/16831004/
> but includes fixes for:
> OutOfProcessPPAPITests.Graphics3D (removed a check in query_tracker.cc)
> GLReadbackTest.ReadPixelsWithPBO (removed, no longer a valid test)
> GLReadbackTest.ReadPixelsWithPBOAndQuery (now uses the correct query)
>
> BUG=249925
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=209873
>
> Review URL: https://chromiumcodereview.appspot.com/18555006
TBR=hubbe@chromium.org
BUG=258169
Review URL: https://codereview.chromium.org/19029003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/gl2extchromium.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h index 433242c..2568074 100644 --- a/gpu/GLES2/gl2extchromium.h +++ b/gpu/GLES2/gl2extchromium.h @@ -339,9 +339,6 @@ typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC) ( #ifndef GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM #define GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM 0x84F5 #endif -#ifndef GL_ASYNC_READ_PIXELS_COMPLETED_CHROMIUM -#define GL_ASYNC_READ_PIXELS_COMPLETED_CHROMIUM 0x84F6 -#endif #endif /* GL_CHROMIUM_async_pixel_transfers */ /* GL_CHROMIUM_copy_texture */ |