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

Side by Side Diff: content/common/gpu/gpu_channel_manager.h

Issue 217813004: Make ShaderTranslatorCache thread safe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 6 years, 8 months 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 | Annotate | Revision Log
« no previous file with comments | « android_webview/browser/hardware_renderer.cc ('k') | content/common/gpu/gpu_channel_manager.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ 5 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ 6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 16 matching lines...) Expand all
27 } 27 }
28 28
29 namespace gfx { 29 namespace gfx {
30 class GLShareGroup; 30 class GLShareGroup;
31 } 31 }
32 32
33 namespace gpu { 33 namespace gpu {
34 namespace gles2 { 34 namespace gles2 {
35 class MailboxManager; 35 class MailboxManager;
36 class ProgramCache; 36 class ProgramCache;
37 class ShaderTranslatorCache;
37 } 38 }
38 } 39 }
39 40
40 namespace IPC { 41 namespace IPC {
41 struct ChannelHandle; 42 struct ChannelHandle;
42 } 43 }
43 44
44 struct GPUCreateCommandBufferConfig; 45 struct GPUCreateCommandBufferConfig;
45 46
46 namespace content { 47 namespace content {
(...skipping 28 matching lines...) Expand all
75 76
76 void LoseAllContexts(); 77 void LoseAllContexts();
77 78
78 base::WeakPtrFactory<GpuChannelManager> weak_factory_; 79 base::WeakPtrFactory<GpuChannelManager> weak_factory_;
79 80
80 int GenerateRouteID(); 81 int GenerateRouteID();
81 void AddRoute(int32 routing_id, IPC::Listener* listener); 82 void AddRoute(int32 routing_id, IPC::Listener* listener);
82 void RemoveRoute(int32 routing_id); 83 void RemoveRoute(int32 routing_id);
83 84
84 gpu::gles2::ProgramCache* program_cache(); 85 gpu::gles2::ProgramCache* program_cache();
86 gpu::gles2::ShaderTranslatorCache* shader_translator_cache();
85 87
86 GpuMemoryManager* gpu_memory_manager() { return &gpu_memory_manager_; } 88 GpuMemoryManager* gpu_memory_manager() { return &gpu_memory_manager_; }
87 89
88 GpuEventsDispatcher* gpu_devtools_events_dispatcher() { 90 GpuEventsDispatcher* gpu_devtools_events_dispatcher() {
89 return &gpu_devtools_events_dispatcher_; 91 return &gpu_devtools_events_dispatcher_;
90 } 92 }
91 93
92 GpuChannel* LookupChannel(int32 client_id); 94 GpuChannel* LookupChannel(int32 client_id);
93 95
94 SyncPointManager* sync_point_manager() { return sync_point_manager_.get(); } 96 SyncPointManager* sync_point_manager() { return sync_point_manager_.get(); }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // one channel for each renderer process that has connected to this GPU 139 // one channel for each renderer process that has connected to this GPU
138 // process. 140 // process.
139 GpuChannelMap gpu_channels_; 141 GpuChannelMap gpu_channels_;
140 scoped_refptr<gfx::GLShareGroup> share_group_; 142 scoped_refptr<gfx::GLShareGroup> share_group_;
141 scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_; 143 scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
142 GpuMemoryManager gpu_memory_manager_; 144 GpuMemoryManager gpu_memory_manager_;
143 GpuEventsDispatcher gpu_devtools_events_dispatcher_; 145 GpuEventsDispatcher gpu_devtools_events_dispatcher_;
144 GpuWatchdog* watchdog_; 146 GpuWatchdog* watchdog_;
145 scoped_refptr<SyncPointManager> sync_point_manager_; 147 scoped_refptr<SyncPointManager> sync_point_manager_;
146 scoped_ptr<gpu::gles2::ProgramCache> program_cache_; 148 scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
149 scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
147 scoped_refptr<gfx::GLSurface> default_offscreen_surface_; 150 scoped_refptr<gfx::GLSurface> default_offscreen_surface_;
148 ImageOperationQueue image_operations_; 151 ImageOperationQueue image_operations_;
149 152
150 DISALLOW_COPY_AND_ASSIGN(GpuChannelManager); 153 DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
151 }; 154 };
152 155
153 } // namespace content 156 } // namespace content
154 157
155 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_ 158 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
OLDNEW
« no previous file with comments | « android_webview/browser/hardware_renderer.cc ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698