OLD | NEW |
---|---|
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 <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... | |
29 #include "media/video/video_decode_accelerator.h" | 29 #include "media/video/video_decode_accelerator.h" |
30 #include "ui/events/latency_info.h" | 30 #include "ui/events/latency_info.h" |
31 #include "ui/gfx/geometry/size.h" | 31 #include "ui/gfx/geometry/size.h" |
32 #include "ui/gfx/gpu_memory_buffer.h" | 32 #include "ui/gfx/gpu_memory_buffer.h" |
33 #include "ui/gfx/native_widget_types.h" | 33 #include "ui/gfx/native_widget_types.h" |
34 #include "ui/gfx/swap_result.h" | 34 #include "ui/gfx/swap_result.h" |
35 #include "ui/gl/gl_surface.h" | 35 #include "ui/gl/gl_surface.h" |
36 #include "ui/gl/gpu_preference.h" | 36 #include "ui/gl/gpu_preference.h" |
37 #include "url/gurl.h" | 37 #include "url/gurl.h" |
38 | 38 |
39 namespace gfx { | |
40 #if defined(ENABLE_VULKAN) | |
41 class VulkanSurface; | |
42 #endif | |
43 } | |
44 | |
39 namespace gpu { | 45 namespace gpu { |
40 struct Mailbox; | 46 struct Mailbox; |
41 struct SyncToken; | 47 struct SyncToken; |
42 class SyncPointClient; | 48 class SyncPointClient; |
43 class SyncPointManager; | 49 class SyncPointManager; |
44 class ValueStateMap; | 50 class ValueStateMap; |
45 namespace gles2 { | 51 namespace gles2 { |
46 class MailboxManager; | 52 class MailboxManager; |
47 class SubscriptionRefSet; | 53 class SubscriptionRefSet; |
48 } | 54 } |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
252 const int32_t stream_id_; | 258 const int32_t stream_id_; |
253 const int32_t route_id_; | 259 const int32_t route_id_; |
254 const bool offscreen_; | 260 const bool offscreen_; |
255 uint32_t last_flush_count_; | 261 uint32_t last_flush_count_; |
256 | 262 |
257 scoped_ptr<gpu::CommandBufferService> command_buffer_; | 263 scoped_ptr<gpu::CommandBufferService> command_buffer_; |
258 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; | 264 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; |
259 scoped_ptr<gpu::GpuScheduler> scheduler_; | 265 scoped_ptr<gpu::GpuScheduler> scheduler_; |
260 scoped_ptr<gpu::SyncPointClient> sync_point_client_; | 266 scoped_ptr<gpu::SyncPointClient> sync_point_client_; |
261 scoped_refptr<gfx::GLSurface> surface_; | 267 scoped_refptr<gfx::GLSurface> surface_; |
268 #if defined(ENABLE_VULKAN) | |
269 scoped_ptr<gfx::VulkanSurface> vk_surface_; | |
270 #endif | |
piman
2016/03/09 01:25:33
I don't think we should be touching GpuCommandBuff
David Yen
2016/03/10 01:39:48
Still working on this, just fixed everything else
David Yen
2016/03/11 01:01:16
This has been reverted and tested through the vulk
| |
262 gfx::GLSurface::Format surface_format_; | 271 gfx::GLSurface::Format surface_format_; |
263 | 272 |
264 GpuWatchdog* watchdog_; | 273 GpuWatchdog* watchdog_; |
265 | 274 |
266 base::ObserverList<DestructionObserver> destruction_observers_; | 275 base::ObserverList<DestructionObserver> destruction_observers_; |
267 | 276 |
268 bool waiting_for_sync_point_; | 277 bool waiting_for_sync_point_; |
269 | 278 |
270 base::TimeTicks process_delayed_work_time_; | 279 base::TimeTicks process_delayed_work_time_; |
271 uint32_t previous_processed_num_; | 280 uint32_t previous_processed_num_; |
272 base::TimeTicks last_idle_time_; | 281 base::TimeTicks last_idle_time_; |
273 | 282 |
274 scoped_refptr<gpu::PreemptionFlag> preemption_flag_; | 283 scoped_refptr<gpu::PreemptionFlag> preemption_flag_; |
275 | 284 |
276 LatencyInfoCallback latency_info_callback_; | 285 LatencyInfoCallback latency_info_callback_; |
277 | 286 |
278 GURL active_url_; | 287 GURL active_url_; |
279 size_t active_url_hash_; | 288 size_t active_url_hash_; |
280 | 289 |
281 scoped_ptr<WaitForCommandState> wait_for_token_; | 290 scoped_ptr<WaitForCommandState> wait_for_token_; |
282 scoped_ptr<WaitForCommandState> wait_for_get_offset_; | 291 scoped_ptr<WaitForCommandState> wait_for_get_offset_; |
283 | 292 |
284 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); | 293 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); |
285 }; | 294 }; |
286 | 295 |
287 } // namespace content | 296 } // namespace content |
288 | 297 |
289 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ | 298 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ |
OLD | NEW |