Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/common/gpu/client/grcontext_for_gles2_interface.h" | 5 #include "content/common/gpu/client/grcontext_for_gles2_interface.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <string.h> | 8 #include <string.h> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
| 14 #include "gpu/command_buffer/client/gles2_interface.h" | 14 #include "gpu/command_buffer/client/gles2_interface.h" |
| 15 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h" | 15 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h" |
| 16 #include "third_party/skia/include/gpu/GrContext.h" | 16 #include "third_party/skia/include/gpu/GrContext.h" |
| 17 #include "third_party/skia/include/gpu/gl/GrGLInterface.h" | 17 #include "third_party/skia/include/gpu/gl/GrGLInterface.h" |
| 18 | 18 |
| 19 namespace content { | 19 namespace content { |
| 20 | 20 |
| 21 GrContextForGLES2Interface::GrContextForGLES2Interface( | 21 GrContextForGLES2Interface::GrContextForGLES2Interface( |
| 22 gpu::gles2::GLES2Interface* gl) { | 22 gpu::gles2::GLES2Interface* gl) { |
| 23 sk_sp<GrGLInterface> interface( | 23 sk_sp<GrGLInterface> interface( |
| 24 skia_bindings::CreateGLES2InterfaceBindings(gl)); | 24 skia_bindings::CreateGLES2InterfaceBindings(gl).get()); |
|
f(malita)
2016/04/06 19:03:34
Extra get() prolly causing trouble here (adoption
tomhudson
2016/04/06 19:30:24
Done.
| |
| 25 gr_context_ = skia::AdoptRef( | 25 gr_context_ = |
| 26 GrContext::Create(kOpenGL_GrBackend, | 26 sk_sp<GrContext>(GrContext::Create(kOpenGL_GrBackend, |
| 27 // GrContext takes ownership of |interface|. | 27 // GrContext takes ownership of |interface|. |
| 28 reinterpret_cast<GrBackendContext>(interface.get()))); | 28 reinterpret_cast<GrBackendContext>(interface.get()))); |
| 29 if (gr_context_) { | 29 if (gr_context_) { |
| 30 // The limit of the number of GPU resources we hold in the GrContext's | 30 // The limit of the number of GPU resources we hold in the GrContext's |
| 31 // GPU cache. | 31 // GPU cache. |
| 32 static const int kMaxGaneshResourceCacheCount = 2048; | 32 static const int kMaxGaneshResourceCacheCount = 2048; |
| 33 // The limit of the bytes allocated toward GPU resources in the GrContext's | 33 // The limit of the bytes allocated toward GPU resources in the GrContext's |
| 34 // GPU cache. | 34 // GPU cache. |
| 35 static const size_t kMaxGaneshResourceCacheBytes = 96 * 1024 * 1024; | 35 static const size_t kMaxGaneshResourceCacheBytes = 96 * 1024 * 1024; |
| 36 | 36 |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 53 | 53 |
| 54 void GrContextForGLES2Interface::FreeGpuResources() { | 54 void GrContextForGLES2Interface::FreeGpuResources() { |
| 55 if (gr_context_) { | 55 if (gr_context_) { |
| 56 TRACE_EVENT_INSTANT0("gpu", "GrContext::freeGpuResources", | 56 TRACE_EVENT_INSTANT0("gpu", "GrContext::freeGpuResources", |
| 57 TRACE_EVENT_SCOPE_THREAD); | 57 TRACE_EVENT_SCOPE_THREAD); |
| 58 gr_context_->freeGpuResources(); | 58 gr_context_->freeGpuResources(); |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 | 61 |
| 62 } // namespace content | 62 } // namespace content |
| OLD | NEW |