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

Side by Side Diff: cc/output/gl_renderer.cc

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 gpu::gles2::GLES2Interface* gl_; 282 gpu::gles2::GLES2Interface* gl_;
283 unsigned query_id_; 283 unsigned query_id_;
284 bool is_pending_; 284 bool is_pending_;
285 base::WeakPtrFactory<SyncQuery> weak_ptr_factory_; 285 base::WeakPtrFactory<SyncQuery> weak_ptr_factory_;
286 286
287 DISALLOW_COPY_AND_ASSIGN(SyncQuery); 287 DISALLOW_COPY_AND_ASSIGN(SyncQuery);
288 }; 288 };
289 289
290 scoped_ptr<GLRenderer> GLRenderer::Create( 290 scoped_ptr<GLRenderer> GLRenderer::Create(
291 RendererClient* client, 291 RendererClient* client,
292 const LayerTreeSettings* settings, 292 const RendererSettings* settings,
293 OutputSurface* output_surface, 293 OutputSurface* output_surface,
294 ResourceProvider* resource_provider, 294 ResourceProvider* resource_provider,
295 TextureMailboxDeleter* texture_mailbox_deleter, 295 TextureMailboxDeleter* texture_mailbox_deleter,
296 int highp_threshold_min) { 296 int highp_threshold_min) {
297 return make_scoped_ptr(new GLRenderer(client, 297 return make_scoped_ptr(new GLRenderer(client,
298 settings, 298 settings,
299 output_surface, 299 output_surface,
300 resource_provider, 300 resource_provider,
301 texture_mailbox_deleter, 301 texture_mailbox_deleter,
302 highp_threshold_min)); 302 highp_threshold_min));
303 } 303 }
304 304
305 GLRenderer::GLRenderer(RendererClient* client, 305 GLRenderer::GLRenderer(RendererClient* client,
306 const LayerTreeSettings* settings, 306 const RendererSettings* settings,
307 OutputSurface* output_surface, 307 OutputSurface* output_surface,
308 ResourceProvider* resource_provider, 308 ResourceProvider* resource_provider,
309 TextureMailboxDeleter* texture_mailbox_deleter, 309 TextureMailboxDeleter* texture_mailbox_deleter,
310 int highp_threshold_min) 310 int highp_threshold_min)
311 : DirectRenderer(client, settings, output_surface, resource_provider), 311 : DirectRenderer(client, settings, output_surface, resource_provider),
312 offscreen_framebuffer_id_(0), 312 offscreen_framebuffer_id_(0),
313 shared_geometry_quad_(QuadVertexRect()), 313 shared_geometry_quad_(QuadVertexRect()),
314 gl_(output_surface->context_provider()->ContextGL()), 314 gl_(output_surface->context_provider()->ContextGL()),
315 context_support_(output_surface->context_provider()->ContextSupport()), 315 context_support_(output_surface->context_provider()->ContextSupport()),
316 texture_mailbox_deleter_(texture_mailbox_deleter), 316 texture_mailbox_deleter_(texture_mailbox_deleter),
(...skipping 2966 matching lines...) Expand 10 before | Expand all | Expand 10 after
3283 context_support_->ScheduleOverlayPlane( 3283 context_support_->ScheduleOverlayPlane(
3284 overlay.plane_z_order, 3284 overlay.plane_z_order,
3285 overlay.transform, 3285 overlay.transform,
3286 pending_overlay_resources_.back()->texture_id(), 3286 pending_overlay_resources_.back()->texture_id(),
3287 overlay.display_rect, 3287 overlay.display_rect,
3288 overlay.uv_rect); 3288 overlay.uv_rect);
3289 } 3289 }
3290 } 3290 }
3291 3291
3292 } // namespace cc 3292 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698