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

Side by Side Diff: gpu/command_buffer/tests/gl_manager.h

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: revert to passing via destructor Created 4 years, 2 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 (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 GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 12
13 #include "base/containers/scoped_ptr_hash_map.h" 13 #include "base/containers/scoped_ptr_hash_map.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "gpu/command_buffer/client/gpu_control.h" 15 #include "gpu/command_buffer/client/gpu_control.h"
16 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 16 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
17 #include "gpu/command_buffer/service/feature_info.h" 17 #include "gpu/command_buffer/service/feature_info.h"
18 #include "gpu/command_buffer/service/gpu_preferences.h" 18 #include "gpu/command_buffer/service/gpu_preferences.h"
19 #include "gpu/command_buffer/service/progress_reporter_stub.h"
19 #include "ui/gfx/geometry/size.h" 20 #include "ui/gfx/geometry/size.h"
20 #include "ui/gfx/gpu_memory_buffer.h" 21 #include "ui/gfx/gpu_memory_buffer.h"
21 22
22 namespace base { 23 namespace base {
23 class CommandLine; 24 class CommandLine;
24 } 25 }
25 26
26 namespace gl { 27 namespace gl {
27 28
28 class GLContext; 29 class GLContext;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 std::unique_ptr<gles2::GLES2Decoder> decoder_; 175 std::unique_ptr<gles2::GLES2Decoder> decoder_;
175 std::unique_ptr<CommandExecutor> executor_; 176 std::unique_ptr<CommandExecutor> executor_;
176 scoped_refptr<gl::GLSurface> surface_; 177 scoped_refptr<gl::GLSurface> surface_;
177 scoped_refptr<gl::GLContext> context_; 178 scoped_refptr<gl::GLContext> context_;
178 std::unique_ptr<gles2::GLES2CmdHelper> gles2_helper_; 179 std::unique_ptr<gles2::GLES2CmdHelper> gles2_helper_;
179 std::unique_ptr<TransferBuffer> transfer_buffer_; 180 std::unique_ptr<TransferBuffer> transfer_buffer_;
180 std::unique_ptr<gles2::GLES2Implementation> gles2_implementation_; 181 std::unique_ptr<gles2::GLES2Implementation> gles2_implementation_;
181 bool context_lost_allowed_; 182 bool context_lost_allowed_;
182 bool pause_commands_; 183 bool pause_commands_;
183 uint32_t paused_order_num_; 184 uint32_t paused_order_num_;
185 gles2::ProgressReporterStub progress_reporter_;
184 186
185 const CommandBufferId command_buffer_id_; 187 const CommandBufferId command_buffer_id_;
186 uint64_t next_fence_sync_release_; 188 uint64_t next_fence_sync_release_;
187 189
188 bool use_iosurface_memory_buffers_ = false; 190 bool use_iosurface_memory_buffers_ = false;
189 191
190 // Used on Android to virtualize GL for all contexts. 192 // Used on Android to virtualize GL for all contexts.
191 static int use_count_; 193 static int use_count_;
192 static scoped_refptr<gl::GLShareGroup>* base_share_group_; 194 static scoped_refptr<gl::GLShareGroup>* base_share_group_;
193 static scoped_refptr<gl::GLSurface>* base_surface_; 195 static scoped_refptr<gl::GLSurface>* base_surface_;
194 static scoped_refptr<gl::GLContext>* base_context_; 196 static scoped_refptr<gl::GLContext>* base_context_;
195 }; 197 };
196 198
197 } // namespace gpu 199 } // namespace gpu
198 200
199 #endif // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 201 #endif // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698