summaryrefslogtreecommitdiffstats
path: root/gpu/GLES2
diff options
context:
space:
mode:
authorhubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 23:17:55 +0000
committerhubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 23:17:55 +0000
commit5a36dc13089e6cf21e7cae9763d08025e78e4cdb (patch)
treefdbf76ac3898592f055c2703dbdc2e4b36651320 /gpu/GLES2
parentb22c8af6b13fb76a84cc61c714e699fbbb7d2918 (diff)
downloadchromium_src-5a36dc13089e6cf21e7cae9763d08025e78e4cdb.zip
chromium_src-5a36dc13089e6cf21e7cae9763d08025e78e4cdb.tar.gz
chromium_src-5a36dc13089e6cf21e7cae9763d08025e78e4cdb.tar.bz2
Revert "Revert 210138 "Perform glReadPixels with PBOs in the gpu, if PBO...""
Third try for getting asynchrous readpixels to work everywhere. This is identical to: https://codereview.chromium.org/16831004/, but with the following fixes: OutOfProcessPPAPITests.Graphics3D (removed a check in query_tracker.cc) GLReadbackTest.ReadPixelsWithPBO (removed, no longer a valid test) GLReadbackTest.ReadPixelsWithPBOAndQuery (now uses the correct query) And, new in this CL: Disable asynchronous readpixels on macosx prior to 10.8, as it would seem that the GL_ARB_fence extension doesn't seem to work on any driver, and there are crashes in readpixel itself on intel drivers. The original CL only disabled the async readpixels path for intel drivers. BUG=258169 Review URL: https://chromiumcodereview.appspot.com/19579008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
-rw-r--r--gpu/GLES2/gl2extchromium.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h
index 2568074..433242c 100644
--- a/gpu/GLES2/gl2extchromium.h
+++ b/gpu/GLES2/gl2extchromium.h
@@ -339,6 +339,9 @@ 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 */