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

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

Issue 1345813002: Added a unique command buffer ID for command buffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 5 years, 3 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 CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ 5 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
6 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ 6 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 return scheduler_.get() && scheduler_->IsPreempted(); 110 return scheduler_.get() && scheduler_->IsPreempted();
111 } 111 }
112 112
113 // Whether there are commands in the buffer that haven't been processed. 113 // Whether there are commands in the buffer that haven't been processed.
114 bool HasUnprocessedCommands(); 114 bool HasUnprocessedCommands();
115 115
116 gpu::gles2::GLES2Decoder* decoder() const { return decoder_.get(); } 116 gpu::gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
117 gpu::GpuScheduler* scheduler() const { return scheduler_.get(); } 117 gpu::GpuScheduler* scheduler() const { return scheduler_.get(); }
118 GpuChannel* channel() const { return channel_; } 118 GpuChannel* channel() const { return channel_; }
119 119
120 // Unique command buffer ID for this command buffer stub.
121 uint64_t command_buffer_id() const { return command_buffer_id_; }
122
120 // Identifies the target surface. 123 // Identifies the target surface.
121 int32 surface_id() const { return surface_id_; } 124 int32 surface_id() const { return surface_id_; }
122 125
123 // Identifies the various GpuCommandBufferStubs in the GPU process belonging 126 // Identifies the various GpuCommandBufferStubs in the GPU process belonging
124 // to the same renderer process. 127 // to the same renderer process.
125 int32 route_id() const { return route_id_; } 128 int32 route_id() const { return route_id_; }
126 129
127 // Identifies the stream for this command buffer. 130 // Identifies the stream for this command buffer.
128 int32 stream_id() const { return stream_id_; } 131 int32 stream_id() const { return stream_id_; }
129 132
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 // The group of contexts that share namespaces with this context. 258 // The group of contexts that share namespaces with this context.
256 scoped_refptr<gpu::gles2::ContextGroup> context_group_; 259 scoped_refptr<gpu::gles2::ContextGroup> context_group_;
257 260
258 bool initialized_; 261 bool initialized_;
259 gfx::GLSurfaceHandle handle_; 262 gfx::GLSurfaceHandle handle_;
260 gfx::Size initial_size_; 263 gfx::Size initial_size_;
261 gpu::gles2::DisallowedFeatures disallowed_features_; 264 gpu::gles2::DisallowedFeatures disallowed_features_;
262 std::vector<int32> requested_attribs_; 265 std::vector<int32> requested_attribs_;
263 gfx::GpuPreference gpu_preference_; 266 gfx::GpuPreference gpu_preference_;
264 bool use_virtualized_gl_context_; 267 bool use_virtualized_gl_context_;
268 const uint64_t command_buffer_id_;
265 const int32 stream_id_; 269 const int32 stream_id_;
266 const int32 route_id_; 270 const int32 route_id_;
267 const int32 surface_id_; 271 const int32 surface_id_;
268 bool software_; 272 bool software_;
269 uint32 last_flush_count_; 273 uint32 last_flush_count_;
270 274
271 scoped_ptr<gpu::CommandBufferService> command_buffer_; 275 scoped_ptr<gpu::CommandBufferService> command_buffer_;
272 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; 276 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
273 scoped_ptr<gpu::GpuScheduler> scheduler_; 277 scoped_ptr<gpu::GpuScheduler> scheduler_;
274 scoped_refptr<gfx::GLSurface> surface_; 278 scoped_refptr<gfx::GLSurface> surface_;
(...skipping 26 matching lines...) Expand all
301 size_t total_gpu_memory_; 305 size_t total_gpu_memory_;
302 scoped_ptr<WaitForCommandState> wait_for_token_; 306 scoped_ptr<WaitForCommandState> wait_for_token_;
303 scoped_ptr<WaitForCommandState> wait_for_get_offset_; 307 scoped_ptr<WaitForCommandState> wait_for_get_offset_;
304 308
305 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); 309 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
306 }; 310 };
307 311
308 } // namespace content 312 } // namespace content
309 313
310 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ 314 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
OLDNEW
« no previous file with comments | « content/common/gpu/client/command_buffer_proxy_impl.cc ('k') | content/common/gpu/gpu_command_buffer_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698