| 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 #ifndef CC_OUTPUT_GL_RENDERER_H_ | 5 #ifndef CC_OUTPUT_GL_RENDERER_H_ |
| 6 #define CC_OUTPUT_GL_RENDERER_H_ | 6 #define CC_OUTPUT_GL_RENDERER_H_ |
| 7 | 7 |
| 8 #include "base/cancelable_callback.h" | 8 #include "base/cancelable_callback.h" |
| 9 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
| 10 #include "cc/base/scoped_ptr_vector.h" | 10 #include "cc/base/scoped_ptr_vector.h" |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 scoped_ptr<SkAutoLockPixels> lock, | 213 scoped_ptr<SkAutoLockPixels> lock, |
| 214 scoped_ptr<CopyOutputRequest> request, | 214 scoped_ptr<CopyOutputRequest> request, |
| 215 bool success); | 215 bool success); |
| 216 | 216 |
| 217 void ReinitializeGLState(); | 217 void ReinitializeGLState(); |
| 218 | 218 |
| 219 virtual void DiscardBackbuffer() OVERRIDE; | 219 virtual void DiscardBackbuffer() OVERRIDE; |
| 220 virtual void EnsureBackbuffer() OVERRIDE; | 220 virtual void EnsureBackbuffer() OVERRIDE; |
| 221 void EnforceMemoryPolicy(); | 221 void EnforceMemoryPolicy(); |
| 222 | 222 |
| 223 void ScheduleOverlays(DrawingFrame* frame); |
| 224 |
| 225 typedef ScopedPtrVector<ResourceProvider::ScopedReadLockGL> |
| 226 OverlayResourceLockList; |
| 227 OverlayResourceLockList pending_overlay_resources_; |
| 228 OverlayResourceLockList in_use_overlay_resources_; |
| 229 |
| 223 RendererCapabilitiesImpl capabilities_; | 230 RendererCapabilitiesImpl capabilities_; |
| 224 | 231 |
| 225 unsigned offscreen_framebuffer_id_; | 232 unsigned offscreen_framebuffer_id_; |
| 226 | 233 |
| 227 scoped_ptr<GeometryBinding> shared_geometry_; | 234 scoped_ptr<GeometryBinding> shared_geometry_; |
| 228 gfx::QuadF shared_geometry_quad_; | 235 gfx::QuadF shared_geometry_quad_; |
| 229 | 236 |
| 230 // This block of bindings defines all of the programs used by the compositor | 237 // This block of bindings defines all of the programs used by the compositor |
| 231 // itself. Add any new programs here to GLRendererShaderTest. | 238 // itself. Add any new programs here to GLRendererShaderTest. |
| 232 | 239 |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 #if DEBUG_GL_CALLS && !defined(NDEBUG) | 447 #if DEBUG_GL_CALLS && !defined(NDEBUG) |
| 441 #define GLC(context, x) \ | 448 #define GLC(context, x) \ |
| 442 (x, GLRenderer::DebugGLCall(&* context, #x, __FILE__, __LINE__)) | 449 (x, GLRenderer::DebugGLCall(&* context, #x, __FILE__, __LINE__)) |
| 443 #else | 450 #else |
| 444 #define GLC(context, x) (x) | 451 #define GLC(context, x) (x) |
| 445 #endif | 452 #endif |
| 446 | 453 |
| 447 } // namespace cc | 454 } // namespace cc |
| 448 | 455 |
| 449 #endif // CC_OUTPUT_GL_RENDERER_H_ | 456 #endif // CC_OUTPUT_GL_RENDERER_H_ |
| OLD | NEW |