| OLD | NEW |
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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/output/gl_renderer.h" | 5 #include "cc/output/gl_renderer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 } else { | 481 } else { |
| 482 read_lock_fence = | 482 read_lock_fence = |
| 483 make_scoped_refptr(new ResourceProvider::SynchronousFence(gl_)); | 483 make_scoped_refptr(new ResourceProvider::SynchronousFence(gl_)); |
| 484 } | 484 } |
| 485 resource_provider_->SetReadLockFence(read_lock_fence.get()); | 485 resource_provider_->SetReadLockFence(read_lock_fence.get()); |
| 486 | 486 |
| 487 // Insert WaitSyncTokenCHROMIUM on quad resources prior to drawing the frame, | 487 // Insert WaitSyncTokenCHROMIUM on quad resources prior to drawing the frame, |
| 488 // so that drawing can proceed without GL context switching interruptions. | 488 // so that drawing can proceed without GL context switching interruptions. |
| 489 ResourceProvider* resource_provider = resource_provider_; | 489 ResourceProvider* resource_provider = resource_provider_; |
| 490 for (const auto& pass : *frame->render_passes_in_draw_order) { | 490 for (const auto& pass : *frame->render_passes_in_draw_order) { |
| 491 for (const auto& quad : pass->quad_list) { | 491 for (auto* quad : pass->quad_list) { |
| 492 for (ResourceId resource_id : quad->resources) | 492 for (ResourceId resource_id : quad->resources) |
| 493 resource_provider->WaitSyncTokenIfNeeded(resource_id); | 493 resource_provider->WaitSyncTokenIfNeeded(resource_id); |
| 494 } | 494 } |
| 495 } | 495 } |
| 496 | 496 |
| 497 // TODO(enne): Do we need to reinitialize all of this state per frame? | 497 // TODO(enne): Do we need to reinitialize all of this state per frame? |
| 498 ReinitializeGLState(); | 498 ReinitializeGLState(); |
| 499 } | 499 } |
| 500 | 500 |
| 501 void GLRenderer::DoDrawQuad(DrawingFrame* frame, | 501 void GLRenderer::DoDrawQuad(DrawingFrame* frame, |
| (...skipping 3185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3687 texture_id = pending_overlay_resources_.back()->texture_id(); | 3687 texture_id = pending_overlay_resources_.back()->texture_id(); |
| 3688 } | 3688 } |
| 3689 | 3689 |
| 3690 context_support_->ScheduleOverlayPlane( | 3690 context_support_->ScheduleOverlayPlane( |
| 3691 overlay.plane_z_order, overlay.transform, texture_id, | 3691 overlay.plane_z_order, overlay.transform, texture_id, |
| 3692 ToNearestRect(overlay.display_rect), overlay.uv_rect); | 3692 ToNearestRect(overlay.display_rect), overlay.uv_rect); |
| 3693 } | 3693 } |
| 3694 } | 3694 } |
| 3695 | 3695 |
| 3696 } // namespace cc | 3696 } // namespace cc |
| OLD | NEW |