Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/texture_layer_impl.h" | 5 #include "cc/texture_layer_impl.h" |
| 6 | 6 |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "cc/layer_tree_impl.h" | |
| 8 #include "cc/quad_sink.h" | 9 #include "cc/quad_sink.h" |
| 9 #include "cc/renderer.h" | 10 #include "cc/renderer.h" |
| 10 #include "cc/texture_draw_quad.h" | 11 #include "cc/texture_draw_quad.h" |
| 11 | 12 |
| 12 namespace cc { | 13 namespace cc { |
| 13 | 14 |
| 14 TextureLayerImpl::TextureLayerImpl(LayerTreeImpl* treeImpl, int id) | 15 TextureLayerImpl::TextureLayerImpl(LayerTreeImpl* treeImpl, int id, bool mailbox Layer) |
| 15 : LayerImpl(treeImpl, id) | 16 : LayerImpl(treeImpl, id) |
| 16 , m_textureId(0) | 17 , m_textureId(0) |
| 17 , m_externalTextureResource(0) | 18 , m_externalTextureResource(0) |
| 18 , m_premultipliedAlpha(true) | 19 , m_premultipliedAlpha(true) |
| 19 , m_flipped(true) | 20 , m_flipped(true) |
| 20 , m_uvRect(0, 0, 1, 1) | 21 , m_uvRect(0, 0, 1, 1) |
| 22 , m_newMailboxPending(false) | |
| 23 , m_mailboxLayer(mailboxLayer) | |
| 21 { | 24 { |
| 22 m_vertexOpacity[0] = 1.0f; | 25 m_vertexOpacity[0] = 1.0f; |
| 23 m_vertexOpacity[1] = 1.0f; | 26 m_vertexOpacity[1] = 1.0f; |
| 24 m_vertexOpacity[2] = 1.0f; | 27 m_vertexOpacity[2] = 1.0f; |
| 25 m_vertexOpacity[3] = 1.0f; | 28 m_vertexOpacity[3] = 1.0f; |
| 26 } | 29 } |
| 27 | 30 |
| 28 TextureLayerImpl::~TextureLayerImpl() | 31 TextureLayerImpl::~TextureLayerImpl() |
| 29 { | 32 { |
| 33 if (m_externalTextureResource) { | |
| 34 ResourceProvider* provider = layerTreeImpl()->resource_provider(); | |
|
danakj
2013/01/02 16:17:22
DCHECK() that we're a mailbox layer here?
| |
| 35 DCHECK(!provider->inUseByConsumer(m_externalTextureResource)); | |
|
danakj
2013/01/02 16:17:22
This will work for now, but puts us in the same po
alexst (slow to review)
2013/01/02 19:31:35
Since callback is stored on the resource, it could
danakj
2013/01/02 19:43:28
Will that require the consumer to know that this l
| |
| 36 provider->deleteResource(m_externalTextureResource); | |
| 37 } | |
| 38 if (m_newMailboxPending && m_mailboxName.size()) | |
| 39 m_mailboxReleaseCallback.Run(0); | |
| 40 } | |
| 41 | |
| 42 void TextureLayerImpl::setTextureMailbox(const std::string& mailboxName, const b ase::Callback<void(unsigned)>& releaseCallback) | |
| 43 { | |
| 44 // Same mailbox name was commited, nothing to do | |
| 45 if (m_mailboxName.compare(mailboxName) == 0) | |
| 46 return; | |
| 47 m_mailboxName = mailboxName; | |
| 48 m_newMailboxPending = true; | |
| 49 m_mailboxReleaseCallback = releaseCallback; | |
|
danakj
2013/01/02 16:17:22
can we prefix all these things with something? lik
alexst (slow to review)
2013/01/02 19:31:35
Done.
| |
| 30 } | 50 } |
| 31 | 51 |
| 32 void TextureLayerImpl::willDraw(ResourceProvider* resourceProvider) | 52 void TextureLayerImpl::willDraw(ResourceProvider* resourceProvider) |
| 33 { | 53 { |
| 54 if (m_mailboxLayer) { | |
| 55 handleMailboxResources(resourceProvider); | |
|
danakj
2013/01/02 16:17:22
nit: prefer to keep all the logic in here as there
alexst (slow to review)
2013/01/02 19:31:35
Done.
| |
| 56 return; | |
| 57 } | |
| 34 if (!m_textureId) | 58 if (!m_textureId) |
| 35 return; | 59 return; |
| 36 DCHECK(!m_externalTextureResource); | 60 DCHECK(!m_externalTextureResource); |
| 37 m_externalTextureResource = resourceProvider->createResourceFromExternalText ure(m_textureId); | 61 m_externalTextureResource = resourceProvider->createResourceFromExternalText ure(m_textureId); |
| 38 } | 62 } |
| 39 | 63 |
| 40 void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQu adsData) | 64 void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQu adsData) |
| 41 { | 65 { |
| 42 if (!m_externalTextureResource) | 66 if (!m_externalTextureResource) |
| 43 return; | 67 return; |
| 44 | 68 |
| 45 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQ uadState()); | 69 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQ uadState()); |
| 46 appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData); | 70 appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData); |
| 47 | 71 |
| 48 gfx::Rect quadRect(gfx::Point(), contentBounds()); | 72 gfx::Rect quadRect(gfx::Point(), contentBounds()); |
| 49 gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect()); | 73 gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect()); |
| 50 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); | 74 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); |
| 51 quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_externalTextureResourc e, m_premultipliedAlpha, m_uvRect, m_vertexOpacity, m_flipped); | 75 quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_externalTextureResourc e, m_premultipliedAlpha, m_uvRect, m_vertexOpacity, m_flipped); |
| 52 | 76 |
| 53 // Perform explicit clipping on a quad to avoid setting a scissor later. | 77 // Perform explicit clipping on a quad to avoid setting a scissor later. |
| 54 if (sharedQuadState->is_clipped && quad->PerformClipping()) | 78 if (sharedQuadState->is_clipped && quad->PerformClipping()) |
| 55 sharedQuadState->is_clipped = false; | 79 sharedQuadState->is_clipped = false; |
| 56 if (!quad->rect.IsEmpty()) | 80 if (!quad->rect.IsEmpty()) |
| 57 quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData); | 81 quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData); |
| 58 } | 82 } |
| 59 | 83 |
| 60 void TextureLayerImpl::didDraw(ResourceProvider* resourceProvider) | 84 void TextureLayerImpl::didDraw(ResourceProvider* resourceProvider) |
| 61 { | 85 { |
| 86 if (m_mailboxLayer) | |
| 87 return; | |
| 62 if (!m_externalTextureResource) | 88 if (!m_externalTextureResource) |
| 63 return; | 89 return; |
| 64 // FIXME: the following assert will not be true when sending resources to a | 90 // FIXME: the following assert will not be true when sending resources to a |
| 65 // parent compositor. A synchronization scheme (double-buffering or | 91 // parent compositor. A synchronization scheme (double-buffering or |
| 66 // pipelining of updates) for the client will need to exist to solve this. | 92 // pipelining of updates) for the client will need to exist to solve this. |
| 67 DCHECK(!resourceProvider->inUseByConsumer(m_externalTextureResource)); | 93 DCHECK(!resourceProvider->inUseByConsumer(m_externalTextureResource)); |
| 68 resourceProvider->deleteResource(m_externalTextureResource); | 94 resourceProvider->deleteResource(m_externalTextureResource); |
| 69 m_externalTextureResource = 0; | 95 m_externalTextureResource = 0; |
| 70 } | 96 } |
| 71 | 97 |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 87 { | 113 { |
| 88 m_textureId = 0; | 114 m_textureId = 0; |
| 89 m_externalTextureResource = 0; | 115 m_externalTextureResource = 0; |
| 90 } | 116 } |
| 91 | 117 |
| 92 const char* TextureLayerImpl::layerTypeAsString() const | 118 const char* TextureLayerImpl::layerTypeAsString() const |
| 93 { | 119 { |
| 94 return "TextureLayer"; | 120 return "TextureLayer"; |
| 95 } | 121 } |
| 96 | 122 |
| 123 void TextureLayerImpl::handleMailboxResources(ResourceProvider* resourceProvider ) | |
| 124 { | |
| 125 if (!m_newMailboxPending) | |
| 126 return; | |
| 127 | |
| 128 if (m_externalTextureResource) { | |
| 129 DCHECK(!resourceProvider->inUseByConsumer(m_externalTextureResource)); | |
| 130 resourceProvider->deleteResource(m_externalTextureResource); | |
| 131 m_externalTextureResource = 0; | |
| 132 } | |
| 133 if (m_mailboxName.size()) | |
| 134 m_externalTextureResource = resourceProvider->createResourceFromTextureM ailbox(m_mailboxName, m_mailboxReleaseCallback); | |
| 135 m_newMailboxPending = false; | |
| 136 } | |
| 137 | |
| 97 } // namespace cc | 138 } // namespace cc |
| OLD | NEW |