diff options
| author | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-18 02:42:26 +0000 |
|---|---|---|
| committer | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-18 02:42:26 +0000 |
| commit | 9ee2343406a6fae9c8aacc7303f7b1e5a04aab9e (patch) | |
| tree | 3dc05a831a93c4ab05c333322a56e14273633ffd /cc/test/layer_tree_pixel_test.cc | |
| parent | 218db375e36b887c6d9cdbbb1f9e1b272ed410f4 (diff) | |
| download | chromium_src-9ee2343406a6fae9c8aacc7303f7b1e5a04aab9e.zip chromium_src-9ee2343406a6fae9c8aacc7303f7b1e5a04aab9e.tar.gz chromium_src-9ee2343406a6fae9c8aacc7303f7b1e5a04aab9e.tar.bz2 | |
Add gpu::MailboxHolder to hold state for a gpu::Mailbox
gpu::Mailbox by itself can hold only a texture id, but in common usage it comes
with texture target and syncpoint information for cross-context sharing. To
reduce repetition of this pattern, gpu::MailboxHolder holds:
* a gpu::Mailbox
* a GL texture target
* a syncpoint index
Refactor other classes to use a gpu::MailboxHolder instead of separate
gpu::Mailbox and associated state.
Syncpoints are created with uint32 indices; make sure all uses of syncpoints use uint32.
BUG=None
TEST=local build, unittests on CrOS snow, desktop Linux
Review URL: https://codereview.chromium.org/105743004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_pixel_test.cc')
| -rw-r--r-- | cc/test/layer_tree_pixel_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index 806b877..379808e 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -247,7 +247,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap( gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - gl->ConsumeTextureCHROMIUM(texture_mailbox.target(), texture_mailbox.data()); + gl->ConsumeTextureCHROMIUM(texture_mailbox.target(), texture_mailbox.name()); gl->BindTexture(GL_TEXTURE_2D, 0); GLuint fbo = 0; @@ -369,7 +369,7 @@ void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture( gl->BindTexture(GL_TEXTURE_2D, 0); uint32 sync_point = gl->InsertSyncPointCHROMIUM(); - *texture_mailbox = TextureMailbox(mailbox, sync_point); + *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point); *release_callback = SingleReleaseCallback::Create( base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox, base::Unretained(this), |