Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: cc/texture_layer_impl.cc

Issue 11638028: Mailbox support for texture layers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Feedback, callback runs on main. Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 usesMai lbox)
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_hasPendingMailbox(false)
23 , m_usesMailbox(usesMailbox)
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 DCHECK(m_usesMailbox);
35 ResourceProvider* provider = layerTreeImpl()->resource_provider();
36 DCHECK(!provider->inUseByConsumer(m_externalTextureResource));
danakj 2013/01/02 20:09:44 I'm okay with a TODO here for ubercomp, and we can
37 provider->deleteResource(m_externalTextureResource);
38 }
39 if (m_hasPendingMailbox && !m_pendingMailboxName.empty())
40 m_pendingMailboxReleaseCallback.Run(0);
41 }
42
43 void TextureLayerImpl::setTextureMailbox(const std::string& mailboxName, const b ase::Callback<void(unsigned)>& releaseCallback)
44 {
45 // Same mailbox name was commited, nothing to do
46 if (m_pendingMailboxName.compare(mailboxName) == 0)
47 return;
48 m_pendingMailboxName = mailboxName;
49 m_hasPendingMailbox = true;
50 m_pendingMailboxReleaseCallback = releaseCallback;
30 } 51 }
31 52
32 void TextureLayerImpl::willDraw(ResourceProvider* resourceProvider) 53 void TextureLayerImpl::willDraw(ResourceProvider* resourceProvider)
33 { 54 {
34 if (!m_textureId) 55 if (!m_usesMailbox) {
56 if (!m_textureId)
57 return;
58 DCHECK(!m_externalTextureResource);
59 m_externalTextureResource = resourceProvider->createResourceFromExternal Texture(m_textureId);
35 return; 60 return;
36 DCHECK(!m_externalTextureResource); 61 }
37 m_externalTextureResource = resourceProvider->createResourceFromExternalText ure(m_textureId); 62
63 if (!m_hasPendingMailbox)
64 return;
65
66 if (m_externalTextureResource) {
67 DCHECK(!resourceProvider->inUseByConsumer(m_externalTextureResource));
68 resourceProvider->deleteResource(m_externalTextureResource);
69 m_externalTextureResource = 0;
70 }
71 if (!m_pendingMailboxName.empty())
72 m_externalTextureResource = resourceProvider->createResourceFromTextureM ailbox(m_pendingMailboxName, m_pendingMailboxReleaseCallback);
73 m_hasPendingMailbox = false;
38 } 74 }
39 75
40 void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQu adsData) 76 void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQu adsData)
41 { 77 {
42 if (!m_externalTextureResource) 78 if (!m_externalTextureResource)
43 return; 79 return;
44 80
45 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQ uadState()); 81 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQ uadState());
46 appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData); 82 appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
47 83
48 gfx::Rect quadRect(gfx::Point(), contentBounds()); 84 gfx::Rect quadRect(gfx::Point(), contentBounds());
49 gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect()); 85 gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect());
50 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); 86 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
51 quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_externalTextureResourc e, m_premultipliedAlpha, m_uvRect, m_vertexOpacity, m_flipped); 87 quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_externalTextureResourc e, m_premultipliedAlpha, m_uvRect, m_vertexOpacity, m_flipped);
52 88
53 // Perform explicit clipping on a quad to avoid setting a scissor later. 89 // Perform explicit clipping on a quad to avoid setting a scissor later.
54 if (sharedQuadState->is_clipped && quad->PerformClipping()) 90 if (sharedQuadState->is_clipped && quad->PerformClipping())
55 sharedQuadState->is_clipped = false; 91 sharedQuadState->is_clipped = false;
56 if (!quad->rect.IsEmpty()) 92 if (!quad->rect.IsEmpty())
57 quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData); 93 quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
58 } 94 }
59 95
60 void TextureLayerImpl::didDraw(ResourceProvider* resourceProvider) 96 void TextureLayerImpl::didDraw(ResourceProvider* resourceProvider)
61 { 97 {
98 if (m_usesMailbox)
99 return;
62 if (!m_externalTextureResource) 100 if (!m_externalTextureResource)
63 return; 101 return;
64 // FIXME: the following assert will not be true when sending resources to a 102 // FIXME: the following assert will not be true when sending resources to a
65 // parent compositor. A synchronization scheme (double-buffering or 103 // parent compositor. A synchronization scheme (double-buffering or
66 // pipelining of updates) for the client will need to exist to solve this. 104 // pipelining of updates) for the client will need to exist to solve this.
67 DCHECK(!resourceProvider->inUseByConsumer(m_externalTextureResource)); 105 DCHECK(!resourceProvider->inUseByConsumer(m_externalTextureResource));
68 resourceProvider->deleteResource(m_externalTextureResource); 106 resourceProvider->deleteResource(m_externalTextureResource);
69 m_externalTextureResource = 0; 107 m_externalTextureResource = 0;
70 } 108 }
71 109
(...skipping 16 matching lines...) Expand all
88 m_textureId = 0; 126 m_textureId = 0;
89 m_externalTextureResource = 0; 127 m_externalTextureResource = 0;
90 } 128 }
91 129
92 const char* TextureLayerImpl::layerTypeAsString() const 130 const char* TextureLayerImpl::layerTypeAsString() const
93 { 131 {
94 return "TextureLayer"; 132 return "TextureLayer";
95 } 133 }
96 134
97 } // namespace cc 135 } // namespace cc
OLDNEW
« cc/texture_layer.cc ('K') | « cc/texture_layer_impl.h ('k') | cc/transferable_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698