diff options
author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 05:22:31 +0000 |
---|---|---|
committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 05:22:31 +0000 |
commit | 5537605dae110a8759e58e54855775fe797d5edf (patch) | |
tree | bf7a84e60e981b59ce14e15b29c09f087b7e7659 /cc | |
parent | b2574fb2fae1f5fb32360318a4bc11495ba543cd (diff) | |
download | chromium_src-5537605dae110a8759e58e54855775fe797d5edf.zip chromium_src-5537605dae110a8759e58e54855775fe797d5edf.tar.gz chromium_src-5537605dae110a8759e58e54855775fe797d5edf.tar.bz2 |
Rename async upload/readback queries to avoid mix-ups
BUG=273824
Review URL: https://chromiumcodereview.appspot.com/23060027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r-- | cc/output/gl_renderer.cc | 4 | ||||
-rw-r--r-- | cc/resources/resource_provider.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 63d8ea8..368ae77 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -2348,7 +2348,7 @@ void GLRenderer::DoGetFramebufferPixels( if (is_async) { query = context_->createQueryEXT(); GLC(context_, context_->beginQueryEXT( - GL_ASYNC_READ_PIXELS_COMPLETED_CHROMIUM, + GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM, query)); } @@ -2389,7 +2389,7 @@ void GLRenderer::DoGetFramebufferPixels( if (is_async) { GLC(context_, context_->endQueryEXT( - GL_ASYNC_READ_PIXELS_COMPLETED_CHROMIUM)); + GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM)); SyncPointHelper::SignalQuery( context_, query, diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index 1911d86..57a1806 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc @@ -1167,7 +1167,7 @@ void ResourceProvider::BeginSetPixels(ResourceId id) { if (!resource->gl_upload_query_id) resource->gl_upload_query_id = context3d->createQueryEXT(); context3d->beginQueryEXT( - GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM, + GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM, resource->gl_upload_query_id); if (allocate) { context3d->asyncTexImage2DCHROMIUM(GL_TEXTURE_2D, @@ -1190,7 +1190,7 @@ void ResourceProvider::BeginSetPixels(ResourceId id) { GL_UNSIGNED_BYTE, NULL); } - context3d->endQueryEXT(GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM); + context3d->endQueryEXT(GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM); context3d->bindBuffer(GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, 0); } |