| 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 "components/mus/surfaces/direct_output_surface.h" | 5 #include "components/mus/surfaces/direct_output_surface.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 void DirectOutputSurface::OnVSyncParametersUpdated( | 42 void DirectOutputSurface::OnVSyncParametersUpdated( |
| 43 const base::TimeTicks& timebase, | 43 const base::TimeTicks& timebase, |
| 44 const base::TimeDelta& interval) { | 44 const base::TimeDelta& interval) { |
| 45 // TODO(brianderson): We should not be receiving 0 intervals. | 45 // TODO(brianderson): We should not be receiving 0 intervals. |
| 46 synthetic_begin_frame_source_->OnUpdateVSyncParameters( | 46 synthetic_begin_frame_source_->OnUpdateVSyncParameters( |
| 47 timebase, | 47 timebase, |
| 48 interval.is_zero() ? cc::BeginFrameArgs::DefaultInterval() : interval); | 48 interval.is_zero() ? cc::BeginFrameArgs::DefaultInterval() : interval); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void DirectOutputSurface::SwapBuffers(cc::CompositorFrame* frame) { | 51 void DirectOutputSurface::SwapBuffers(cc::CompositorFrame frame) { |
| 52 DCHECK(context_provider_); | 52 DCHECK(context_provider_); |
| 53 DCHECK(frame->gl_frame_data); | 53 DCHECK(frame.gl_frame_data); |
| 54 if (frame->gl_frame_data->sub_buffer_rect == | 54 if (frame.gl_frame_data->sub_buffer_rect == |
| 55 gfx::Rect(frame->gl_frame_data->size)) { | 55 gfx::Rect(frame.gl_frame_data->size)) { |
| 56 context_provider_->ContextSupport()->Swap(); | 56 context_provider_->ContextSupport()->Swap(); |
| 57 } else { | 57 } else { |
| 58 context_provider_->ContextSupport()->PartialSwapBuffers( | 58 context_provider_->ContextSupport()->PartialSwapBuffers( |
| 59 frame->gl_frame_data->sub_buffer_rect); | 59 frame.gl_frame_data->sub_buffer_rect); |
| 60 } | 60 } |
| 61 | 61 |
| 62 gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL(); | 62 gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL(); |
| 63 const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM(); | 63 const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM(); |
| 64 gl->ShallowFlushCHROMIUM(); | 64 gl->ShallowFlushCHROMIUM(); |
| 65 | 65 |
| 66 gpu::SyncToken sync_token; | 66 gpu::SyncToken sync_token; |
| 67 gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, sync_token.GetData()); | 67 gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, sync_token.GetData()); |
| 68 | 68 |
| 69 context_provider_->ContextSupport()->SignalSyncToken( | 69 context_provider_->ContextSupport()->SignalSyncToken( |
| 70 sync_token, base::Bind(&OutputSurface::OnSwapBuffersComplete, | 70 sync_token, base::Bind(&OutputSurface::OnSwapBuffersComplete, |
| 71 weak_ptr_factory_.GetWeakPtr())); | 71 weak_ptr_factory_.GetWeakPtr())); |
| 72 client_->DidSwapBuffers(); | 72 client_->DidSwapBuffers(); |
| 73 } | 73 } |
| 74 | 74 |
| 75 uint32_t DirectOutputSurface::GetFramebufferCopyTextureFormat() { | 75 uint32_t DirectOutputSurface::GetFramebufferCopyTextureFormat() { |
| 76 // TODO(danakj): What attributes are used for the default framebuffer here? | 76 // TODO(danakj): What attributes are used for the default framebuffer here? |
| 77 // Can it have alpha? SurfacesContextProvider doesn't take any attributes. | 77 // Can it have alpha? SurfacesContextProvider doesn't take any attributes. |
| 78 return GL_RGB; | 78 return GL_RGB; |
| 79 } | 79 } |
| 80 | 80 |
| 81 } // namespace mus | 81 } // namespace mus |
| OLD | NEW |