OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/pepper/ppb_graphics_3d_impl.h" | 5 #include "content/renderer/pepper/ppb_graphics_3d_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "gpu/ipc/client/command_buffer_proxy_impl.h" | 21 #include "gpu/ipc/client/command_buffer_proxy_impl.h" |
22 #include "gpu/ipc/client/gpu_channel_host.h" | 22 #include "gpu/ipc/client/gpu_channel_host.h" |
23 #include "ppapi/c/ppp_graphics_3d.h" | 23 #include "ppapi/c/ppp_graphics_3d.h" |
24 #include "ppapi/thunk/enter.h" | 24 #include "ppapi/thunk/enter.h" |
25 #include "third_party/WebKit/public/platform/WebString.h" | 25 #include "third_party/WebKit/public/platform/WebString.h" |
26 #include "third_party/WebKit/public/web/WebConsoleMessage.h" | 26 #include "third_party/WebKit/public/web/WebConsoleMessage.h" |
27 #include "third_party/WebKit/public/web/WebDocument.h" | 27 #include "third_party/WebKit/public/web/WebDocument.h" |
28 #include "third_party/WebKit/public/web/WebElement.h" | 28 #include "third_party/WebKit/public/web/WebElement.h" |
29 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 29 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
30 #include "third_party/WebKit/public/web/WebPluginContainer.h" | 30 #include "third_party/WebKit/public/web/WebPluginContainer.h" |
| 31 #include "third_party/khronos/GLES2/gl2.h" |
31 | 32 |
32 using ppapi::thunk::EnterResourceNoLock; | 33 using ppapi::thunk::EnterResourceNoLock; |
33 using ppapi::thunk::PPB_Graphics3D_API; | 34 using ppapi::thunk::PPB_Graphics3D_API; |
34 using blink::WebConsoleMessage; | 35 using blink::WebConsoleMessage; |
35 using blink::WebLocalFrame; | 36 using blink::WebLocalFrame; |
36 using blink::WebPluginContainer; | 37 using blink::WebPluginContainer; |
37 using blink::WebString; | 38 using blink::WebString; |
38 | 39 |
39 namespace content { | 40 namespace content { |
40 | 41 |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 int32_t start, | 108 int32_t start, |
108 int32_t end) { | 109 int32_t end) { |
109 GetCommandBuffer()->WaitForGetOffsetInRange(start, end); | 110 GetCommandBuffer()->WaitForGetOffsetInRange(start, end); |
110 return GetCommandBuffer()->GetLastState(); | 111 return GetCommandBuffer()->GetLastState(); |
111 } | 112 } |
112 | 113 |
113 void PPB_Graphics3D_Impl::EnsureWorkVisible() { | 114 void PPB_Graphics3D_Impl::EnsureWorkVisible() { |
114 command_buffer_->EnsureWorkVisible(); | 115 command_buffer_->EnsureWorkVisible(); |
115 } | 116 } |
116 | 117 |
| 118 void PPB_Graphics3D_Impl::TakeFrontBuffer() { |
| 119 if (!taken_front_buffer_.IsZero()) { |
| 120 DLOG(ERROR) |
| 121 << "TakeFrontBuffer should only be called once before DoSwapBuffers"; |
| 122 return; |
| 123 } |
| 124 taken_front_buffer_ = GenerateMailbox(); |
| 125 command_buffer_->TakeFrontBuffer(taken_front_buffer_); |
| 126 } |
| 127 |
| 128 void PPB_Graphics3D_Impl::ReturnFrontBuffer(const gpu::Mailbox& mailbox, |
| 129 const gpu::SyncToken& sync_token, |
| 130 bool is_lost) { |
| 131 command_buffer_->ReturnFrontBuffer(mailbox, sync_token, is_lost); |
| 132 mailboxes_to_reuse_.push_back(mailbox); |
| 133 } |
| 134 |
117 bool PPB_Graphics3D_Impl::BindToInstance(bool bind) { | 135 bool PPB_Graphics3D_Impl::BindToInstance(bool bind) { |
118 bound_to_instance_ = bind; | 136 bound_to_instance_ = bind; |
119 return true; | 137 return true; |
120 } | 138 } |
121 | 139 |
122 bool PPB_Graphics3D_Impl::IsOpaque() { return !has_alpha_; } | 140 bool PPB_Graphics3D_Impl::IsOpaque() { return !has_alpha_; } |
123 | 141 |
124 void PPB_Graphics3D_Impl::ViewInitiatedPaint() { | 142 void PPB_Graphics3D_Impl::ViewInitiatedPaint() { |
125 commit_pending_ = false; | 143 commit_pending_ = false; |
126 | 144 |
127 if (HasPendingSwap()) | 145 if (HasPendingSwap()) |
128 SwapBuffersACK(PP_OK); | 146 SwapBuffersACK(PP_OK); |
129 } | 147 } |
130 | 148 |
131 gpu::CommandBufferProxyImpl* PPB_Graphics3D_Impl::GetCommandBufferProxy() { | 149 gpu::CommandBufferProxyImpl* PPB_Graphics3D_Impl::GetCommandBufferProxy() { |
132 DCHECK(command_buffer_); | 150 DCHECK(command_buffer_); |
133 return command_buffer_.get(); | 151 return command_buffer_.get(); |
134 } | 152 } |
135 | 153 |
136 gpu::CommandBuffer* PPB_Graphics3D_Impl::GetCommandBuffer() { | 154 gpu::CommandBuffer* PPB_Graphics3D_Impl::GetCommandBuffer() { |
137 return command_buffer_.get(); | 155 return command_buffer_.get(); |
138 } | 156 } |
139 | 157 |
140 gpu::GpuControl* PPB_Graphics3D_Impl::GetGpuControl() { | 158 gpu::GpuControl* PPB_Graphics3D_Impl::GetGpuControl() { |
141 return command_buffer_.get(); | 159 return command_buffer_.get(); |
142 } | 160 } |
143 | 161 |
144 int32_t PPB_Graphics3D_Impl::DoSwapBuffers(const gpu::SyncToken& sync_token) { | 162 int32_t PPB_Graphics3D_Impl::DoSwapBuffers(const gpu::SyncToken& sync_token) { |
145 DCHECK(command_buffer_); | 163 DCHECK(command_buffer_); |
146 if (sync_token.HasData()) | 164 if (taken_front_buffer_.IsZero()) { |
147 sync_token_ = sync_token; | 165 DLOG(ERROR) << "TakeFrontBuffer should be called before DoSwapBuffers"; |
| 166 return PP_ERROR_FAILED; |
| 167 } |
148 | 168 |
149 if (bound_to_instance_) { | 169 if (bound_to_instance_) { |
150 // If we are bound to the instance, we need to ask the compositor | 170 // If we are bound to the instance, we need to ask the compositor |
151 // to commit our backing texture so that the graphics appears on the page. | 171 // to commit our backing texture so that the graphics appears on the page. |
152 // When the backing texture will be committed we get notified via | 172 // When the backing texture will be committed we get notified via |
153 // ViewFlushedPaint(). | 173 // ViewFlushedPaint(). |
154 // | 174 // |
155 // Don't need to check for NULL from GetPluginInstance since when we're | 175 // Don't need to check for NULL from GetPluginInstance since when we're |
156 // bound, we know our instance is valid. | 176 // bound, we know our instance is valid. |
157 HostGlobals::Get()->GetInstance(pp_instance())->CommitBackingTexture(); | 177 cc::TextureMailbox texture_mailbox(taken_front_buffer_, sync_token, |
| 178 GL_TEXTURE_2D); |
| 179 taken_front_buffer_.SetZero(); |
| 180 HostGlobals::Get() |
| 181 ->GetInstance(pp_instance()) |
| 182 ->CommitTextureMailbox(texture_mailbox); |
158 commit_pending_ = true; | 183 commit_pending_ = true; |
159 } else { | 184 } else { |
160 // Wait for the command to complete on the GPU to allow for throttling. | 185 // Wait for the command to complete on the GPU to allow for throttling. |
161 command_buffer_->SignalSyncToken( | 186 command_buffer_->SignalSyncToken( |
162 sync_token_, | 187 sync_token, base::Bind(&PPB_Graphics3D_Impl::OnSwapBuffers, |
163 base::Bind(&PPB_Graphics3D_Impl::OnSwapBuffers, | 188 weak_ptr_factory_.GetWeakPtr())); |
164 weak_ptr_factory_.GetWeakPtr())); | |
165 } | 189 } |
166 | 190 |
167 return PP_OK_COMPLETIONPENDING; | 191 return PP_OK_COMPLETIONPENDING; |
168 } | 192 } |
169 | 193 |
170 bool PPB_Graphics3D_Impl::InitRaw(PPB_Graphics3D_API* share_context, | 194 bool PPB_Graphics3D_Impl::InitRaw(PPB_Graphics3D_API* share_context, |
171 const int32_t* attrib_list, | 195 const int32_t* attrib_list, |
172 gpu::Capabilities* capabilities, | 196 gpu::Capabilities* capabilities, |
173 base::SharedMemoryHandle* shared_state_handle, | 197 base::SharedMemoryHandle* shared_state_handle, |
174 gpu::CommandBufferId* command_buffer_id) { | 198 gpu::CommandBufferId* command_buffer_id) { |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 if (!command_buffer_->Initialize()) | 279 if (!command_buffer_->Initialize()) |
256 return false; | 280 return false; |
257 | 281 |
258 if (shared_state_handle) | 282 if (shared_state_handle) |
259 *shared_state_handle = command_buffer_->GetSharedStateHandle(); | 283 *shared_state_handle = command_buffer_->GetSharedStateHandle(); |
260 if (capabilities) | 284 if (capabilities) |
261 *capabilities = command_buffer_->GetCapabilities(); | 285 *capabilities = command_buffer_->GetCapabilities(); |
262 if (command_buffer_id) | 286 if (command_buffer_id) |
263 *command_buffer_id = command_buffer_->GetCommandBufferID(); | 287 *command_buffer_id = command_buffer_->GetCommandBufferID(); |
264 | 288 |
265 mailbox_ = gpu::Mailbox::Generate(); | |
266 if (!command_buffer_->ProduceFrontBuffer(mailbox_)) | |
267 return false; | |
268 | |
269 return true; | 289 return true; |
270 } | 290 } |
271 | 291 |
272 void PPB_Graphics3D_Impl::OnGpuControlErrorMessage(const char* message, | 292 void PPB_Graphics3D_Impl::OnGpuControlErrorMessage(const char* message, |
273 int32_t id) { | 293 int32_t id) { |
274 if (!bound_to_instance_) | 294 if (!bound_to_instance_) |
275 return; | 295 return; |
276 WebPluginContainer* container = | 296 WebPluginContainer* container = |
277 HostGlobals::Get()->GetInstance(pp_instance())->container(); | 297 HostGlobals::Get()->GetInstance(pp_instance())->container(); |
278 if (!container) | 298 if (!container) |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 const PPP_Graphics3D* ppp_graphics_3d = static_cast<const PPP_Graphics3D*>( | 352 const PPP_Graphics3D* ppp_graphics_3d = static_cast<const PPP_Graphics3D*>( |
333 instance->module()->GetPluginInterface(PPP_GRAPHICS_3D_INTERFACE)); | 353 instance->module()->GetPluginInterface(PPP_GRAPHICS_3D_INTERFACE)); |
334 // We have to check *again* that the instance exists, because it could have | 354 // We have to check *again* that the instance exists, because it could have |
335 // been deleted during GetPluginInterface(). Even the PluginModule could be | 355 // been deleted during GetPluginInterface(). Even the PluginModule could be |
336 // deleted, but in that case, the instance should also be gone, so the | 356 // deleted, but in that case, the instance should also be gone, so the |
337 // GetInstance check covers both cases. | 357 // GetInstance check covers both cases. |
338 if (ppp_graphics_3d && HostGlobals::Get()->GetInstance(this_pp_instance)) | 358 if (ppp_graphics_3d && HostGlobals::Get()->GetInstance(this_pp_instance)) |
339 ppp_graphics_3d->Graphics3DContextLost(this_pp_instance); | 359 ppp_graphics_3d->Graphics3DContextLost(this_pp_instance); |
340 } | 360 } |
341 | 361 |
| 362 gpu::Mailbox PPB_Graphics3D_Impl::GenerateMailbox() { |
| 363 if (!mailboxes_to_reuse_.empty()) { |
| 364 gpu::Mailbox mailbox = mailboxes_to_reuse_.back(); |
| 365 mailboxes_to_reuse_.pop_back(); |
| 366 return mailbox; |
| 367 } |
| 368 |
| 369 return gpu::Mailbox::Generate(); |
| 370 } |
| 371 |
342 } // namespace content | 372 } // namespace content |
OLD | NEW |