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

Side by Side Diff: gpu/command_buffer/service/in_process_command_buffer.h

Issue 1278333003: Fix crash caused by concurrent access to framebuffer_combo_complete_map_. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef GPU_COMMAND_BUFFER_SERVICE_IN_PROCESS_COMMAND_BUFFER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_IN_PROCESS_COMMAND_BUFFER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_IN_PROCESS_COMMAND_BUFFER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_IN_PROCESS_COMMAND_BUFFER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 namespace gpu { 44 namespace gpu {
45 class StreamTextureManagerInProcess; 45 class StreamTextureManagerInProcess;
46 } 46 }
47 #endif 47 #endif
48 48
49 namespace gpu { 49 namespace gpu {
50 class SyncPointManager; 50 class SyncPointManager;
51 class ValueStateMap; 51 class ValueStateMap;
52 52
53 namespace gles2 { 53 namespace gles2 {
54 class FramebufferCompletenessCache;
54 class GLES2Decoder; 55 class GLES2Decoder;
55 class MailboxManager; 56 class MailboxManager;
56 class ShaderTranslatorCache; 57 class ShaderTranslatorCache;
57 class SubscriptionRefSet; 58 class SubscriptionRefSet;
58 } 59 }
59 60
60 class CommandBufferServiceBase; 61 class CommandBufferServiceBase;
61 class GpuMemoryBufferManager; 62 class GpuMemoryBufferManager;
62 class GpuScheduler; 63 class GpuScheduler;
63 class ImageFactory; 64 class ImageFactory;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Queues a task to run as soon as possible. 138 // Queues a task to run as soon as possible.
138 virtual void ScheduleTask(const base::Closure& task) = 0; 139 virtual void ScheduleTask(const base::Closure& task) = 0;
139 140
140 // Schedules |callback| to run at an appropriate time for performing idle 141 // Schedules |callback| to run at an appropriate time for performing idle
141 // work. 142 // work.
142 virtual void ScheduleIdleWork(const base::Closure& task) = 0; 143 virtual void ScheduleIdleWork(const base::Closure& task) = 0;
143 144
144 virtual bool UseVirtualizedGLContexts() = 0; 145 virtual bool UseVirtualizedGLContexts() = 0;
145 virtual scoped_refptr<gles2::ShaderTranslatorCache> 146 virtual scoped_refptr<gles2::ShaderTranslatorCache>
146 shader_translator_cache() = 0; 147 shader_translator_cache() = 0;
148 virtual scoped_refptr<gles2::FramebufferCompletenessCache>
149 framebuffer_completeness_cache() = 0;
147 virtual SyncPointManager* sync_point_manager() = 0; 150 virtual SyncPointManager* sync_point_manager() = 0;
148 scoped_refptr<gfx::GLShareGroup> share_group(); 151 scoped_refptr<gfx::GLShareGroup> share_group();
149 scoped_refptr<gles2::MailboxManager> mailbox_manager(); 152 scoped_refptr<gles2::MailboxManager> mailbox_manager();
150 scoped_refptr<gles2::SubscriptionRefSet> subscription_ref_set(); 153 scoped_refptr<gles2::SubscriptionRefSet> subscription_ref_set();
151 scoped_refptr<gpu::ValueStateMap> pending_valuebuffer_state(); 154 scoped_refptr<gpu::ValueStateMap> pending_valuebuffer_state();
152 155
153 private: 156 private:
154 scoped_refptr<gfx::GLShareGroup> share_group_; 157 scoped_refptr<gfx::GLShareGroup> share_group_;
155 scoped_refptr<gles2::MailboxManager> mailbox_manager_; 158 scoped_refptr<gles2::MailboxManager> mailbox_manager_;
156 scoped_refptr<gles2::SubscriptionRefSet> subscription_ref_set_; 159 scoped_refptr<gles2::SubscriptionRefSet> subscription_ref_set_;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 public: 275 public:
273 explicit GpuInProcessThread(SyncPointManager* sync_point_manager); 276 explicit GpuInProcessThread(SyncPointManager* sync_point_manager);
274 277
275 void AddRef() const override; 278 void AddRef() const override;
276 void Release() const override; 279 void Release() const override;
277 void ScheduleTask(const base::Closure& task) override; 280 void ScheduleTask(const base::Closure& task) override;
278 void ScheduleIdleWork(const base::Closure& callback) override; 281 void ScheduleIdleWork(const base::Closure& callback) override;
279 bool UseVirtualizedGLContexts() override; 282 bool UseVirtualizedGLContexts() override;
280 scoped_refptr<gles2::ShaderTranslatorCache> shader_translator_cache() 283 scoped_refptr<gles2::ShaderTranslatorCache> shader_translator_cache()
281 override; 284 override;
285 scoped_refptr<gles2::FramebufferCompletenessCache>
286 framebuffer_completeness_cache() override;
282 SyncPointManager* sync_point_manager() override; 287 SyncPointManager* sync_point_manager() override;
283 288
284 private: 289 private:
285 ~GpuInProcessThread() override; 290 ~GpuInProcessThread() override;
286 friend class base::RefCountedThreadSafe<GpuInProcessThread>; 291 friend class base::RefCountedThreadSafe<GpuInProcessThread>;
287 292
288 SyncPointManager* sync_point_manager_; // Non-owning. 293 SyncPointManager* sync_point_manager_; // Non-owning.
289 scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_; 294 scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
295 scoped_refptr<gpu::gles2::FramebufferCompletenessCache>
296 framebuffer_completeness_cache_;
290 DISALLOW_COPY_AND_ASSIGN(GpuInProcessThread); 297 DISALLOW_COPY_AND_ASSIGN(GpuInProcessThread);
291 }; 298 };
292 299
293 } // namespace gpu 300 } // namespace gpu
294 301
295 #endif // GPU_COMMAND_BUFFER_SERVICE_IN_PROCESS_COMMAND_BUFFER_H_ 302 #endif // GPU_COMMAND_BUFFER_SERVICE_IN_PROCESS_COMMAND_BUFFER_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc ('k') | gpu/command_buffer/service/in_process_command_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698