OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/browser/compositor/gpu_surfaceless_browser_compositor_output_s
urface.h" | 5 #include "content/browser/compositor/gpu_surfaceless_browser_compositor_output_s
urface.h" |
6 | 6 |
7 #include "cc/output/compositor_frame.h" | 7 #include "cc/output/compositor_frame.h" |
8 #include "content/browser/compositor/buffer_queue.h" | 8 #include "content/browser/compositor/buffer_queue.h" |
9 #include "content/browser/compositor/reflector_impl.h" | 9 #include "content/browser/compositor/reflector_impl.h" |
10 #include "content/browser/gpu/gpu_surface_tracker.h" | 10 #include "content/browser/gpu/gpu_surface_tracker.h" |
11 #include "content/common/gpu/client/context_provider_command_buffer.h" | 11 #include "content/common/gpu/client/context_provider_command_buffer.h" |
12 #include "gpu/GLES2/gl2extchromium.h" | 12 #include "gpu/GLES2/gl2extchromium.h" |
13 #include "gpu/command_buffer/client/gles2_interface.h" | 13 #include "gpu/command_buffer/client/gles2_interface.h" |
14 | 14 |
15 namespace content { | 15 namespace content { |
16 | 16 |
17 GpuSurfacelessBrowserCompositorOutputSurface:: | 17 GpuSurfacelessBrowserCompositorOutputSurface:: |
18 GpuSurfacelessBrowserCompositorOutputSurface( | 18 GpuSurfacelessBrowserCompositorOutputSurface( |
19 const scoped_refptr<ContextProviderCommandBuffer>& context, | 19 const scoped_refptr<ContextProviderCommandBuffer>& context, |
20 int surface_id, | 20 int surface_id, |
21 IDMap<BrowserCompositorOutputSurface>* output_surface_map, | 21 IDMap<BrowserCompositorOutputSurface>* output_surface_map, |
22 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, | 22 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
23 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator, | 23 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator, |
| 24 GLHelper* gl_helper, |
24 unsigned internalformat) | 25 unsigned internalformat) |
25 : GpuBrowserCompositorOutputSurface(context, | 26 : GpuBrowserCompositorOutputSurface(context, |
26 surface_id, | 27 surface_id, |
27 output_surface_map, | 28 output_surface_map, |
28 vsync_manager, | 29 vsync_manager, |
29 overlay_candidate_validator.Pass()), | 30 overlay_candidate_validator.Pass()), |
30 internalformat_(internalformat) { | 31 internalformat_(internalformat), |
| 32 gl_helper_(gl_helper) { |
31 } | 33 } |
32 | 34 |
33 GpuSurfacelessBrowserCompositorOutputSurface:: | 35 GpuSurfacelessBrowserCompositorOutputSurface:: |
34 ~GpuSurfacelessBrowserCompositorOutputSurface() { | 36 ~GpuSurfacelessBrowserCompositorOutputSurface() { |
35 } | 37 } |
36 | 38 |
37 void GpuSurfacelessBrowserCompositorOutputSurface::SwapBuffers( | 39 void GpuSurfacelessBrowserCompositorOutputSurface::SwapBuffers( |
38 cc::CompositorFrame* frame) { | 40 cc::CompositorFrame* frame) { |
39 DCHECK(output_surface_); | 41 DCHECK(output_surface_); |
40 | 42 |
| 43 output_surface_->SwapBuffers(frame->gl_frame_data->sub_buffer_rect); |
| 44 // Disable the sub-buffer processing path on the parent classes, because we |
| 45 // have handled it here. |
| 46 frame->gl_frame_data->sub_buffer_rect = gfx::Rect(frame->gl_frame_data->size); |
| 47 |
41 const gfx::Size& size = frame->gl_frame_data->size; | 48 const gfx::Size& size = frame->gl_frame_data->size; |
42 context_provider_->ContextGL()->ScheduleOverlayPlaneCHROMIUM( | 49 context_provider_->ContextGL()->ScheduleOverlayPlaneCHROMIUM( |
43 0, | 50 0, |
44 GL_OVERLAY_TRANSFORM_NONE_CHROMIUM, | 51 GL_OVERLAY_TRANSFORM_NONE_CHROMIUM, |
45 output_surface_->current_texture_id(), | 52 output_surface_->current_texture_id(), |
46 0, | 53 0, |
47 0, | 54 0, |
48 size.width(), | 55 size.width(), |
49 size.height(), | 56 size.height(), |
50 0, | 57 0, |
51 0, | 58 0, |
52 1.0f, | 59 1.0f, |
53 1.0f); | 60 1.0f); |
54 output_surface_->SwapBuffers(); | |
55 GpuBrowserCompositorOutputSurface::SwapBuffers(frame); | 61 GpuBrowserCompositorOutputSurface::SwapBuffers(frame); |
56 } | 62 } |
57 | 63 |
58 void GpuSurfacelessBrowserCompositorOutputSurface::OnSwapBuffersComplete() { | 64 void GpuSurfacelessBrowserCompositorOutputSurface::OnSwapBuffersComplete() { |
59 DCHECK(output_surface_); | 65 DCHECK(output_surface_); |
60 output_surface_->PageFlipComplete(); | 66 output_surface_->PageFlipComplete(); |
61 GpuBrowserCompositorOutputSurface::OnSwapBuffersComplete(); | 67 GpuBrowserCompositorOutputSurface::OnSwapBuffersComplete(); |
62 } | 68 } |
63 | 69 |
64 void GpuSurfacelessBrowserCompositorOutputSurface::BindFramebuffer() { | 70 void GpuSurfacelessBrowserCompositorOutputSurface::BindFramebuffer() { |
65 DCHECK(output_surface_); | 71 DCHECK(output_surface_); |
66 output_surface_->BindFramebuffer(); | 72 output_surface_->BindFramebuffer(); |
67 } | 73 } |
68 | 74 |
69 void GpuSurfacelessBrowserCompositorOutputSurface::Reshape( | 75 void GpuSurfacelessBrowserCompositorOutputSurface::Reshape( |
70 const gfx::Size& size, | 76 const gfx::Size& size, |
71 float scale_factor) { | 77 float scale_factor) { |
72 GpuBrowserCompositorOutputSurface::Reshape(size, scale_factor); | 78 GpuBrowserCompositorOutputSurface::Reshape(size, scale_factor); |
73 DCHECK(output_surface_); | 79 DCHECK(output_surface_); |
74 output_surface_->Reshape(SurfaceSize(), scale_factor); | 80 output_surface_->Reshape(SurfaceSize(), scale_factor); |
75 } | 81 } |
76 | 82 |
77 bool GpuSurfacelessBrowserCompositorOutputSurface::BindToClient( | 83 bool GpuSurfacelessBrowserCompositorOutputSurface::BindToClient( |
78 cc::OutputSurfaceClient* client) { | 84 cc::OutputSurfaceClient* client) { |
79 if (!GpuBrowserCompositorOutputSurface::BindToClient(client)) | 85 if (!GpuBrowserCompositorOutputSurface::BindToClient(client)) |
80 return false; | 86 return false; |
81 output_surface_.reset(new BufferQueue(context_provider_, internalformat_)); | 87 output_surface_.reset( |
| 88 new BufferQueue(context_provider_, gl_helper_, internalformat_)); |
82 return output_surface_->Initialize(); | 89 return output_surface_->Initialize(); |
83 } | 90 } |
84 | 91 |
85 } // namespace content | 92 } // namespace content |
OLD | NEW |