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

Side by Side Diff: gpu/ipc/service/gpu_channel_manager.cc

Issue 2682723003: Make disabling accelerated VPX decoding a GPU driver bug workaround. (Closed)
Patch Set: remove flag Created 3 years, 10 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 #include "gpu/ipc/service/gpu_channel_manager.h" 5 #include "gpu/ipc/service/gpu_channel_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 27 matching lines...) Expand all
38 const int kMaxGpuIdleTimeMs = 40; 38 const int kMaxGpuIdleTimeMs = 40;
39 // Maximum amount of time we keep pinging the GPU waiting for the client to 39 // Maximum amount of time we keep pinging the GPU waiting for the client to
40 // draw. 40 // draw.
41 const int kMaxKeepAliveTimeMs = 200; 41 const int kMaxKeepAliveTimeMs = 200;
42 #endif 42 #endif
43 43
44 } 44 }
45 45
46 GpuChannelManager::GpuChannelManager( 46 GpuChannelManager::GpuChannelManager(
47 const GpuPreferences& gpu_preferences, 47 const GpuPreferences& gpu_preferences,
48 const GpuDriverBugWorkarounds& workarounds,
48 GpuChannelManagerDelegate* delegate, 49 GpuChannelManagerDelegate* delegate,
49 GpuWatchdogThread* watchdog, 50 GpuWatchdogThread* watchdog,
50 base::SingleThreadTaskRunner* task_runner, 51 base::SingleThreadTaskRunner* task_runner,
51 base::SingleThreadTaskRunner* io_task_runner, 52 base::SingleThreadTaskRunner* io_task_runner,
52 base::WaitableEvent* shutdown_event, 53 base::WaitableEvent* shutdown_event,
53 SyncPointManager* sync_point_manager, 54 SyncPointManager* sync_point_manager,
54 GpuMemoryBufferFactory* gpu_memory_buffer_factory) 55 GpuMemoryBufferFactory* gpu_memory_buffer_factory)
55 : task_runner_(task_runner), 56 : task_runner_(task_runner),
56 io_task_runner_(io_task_runner), 57 io_task_runner_(io_task_runner),
57 gpu_preferences_(gpu_preferences), 58 gpu_preferences_(gpu_preferences),
58 gpu_driver_bug_workarounds_(base::CommandLine::ForCurrentProcess()), 59 gpu_driver_bug_workarounds_(workarounds),
59 delegate_(delegate), 60 delegate_(delegate),
60 watchdog_(watchdog), 61 watchdog_(watchdog),
61 shutdown_event_(shutdown_event), 62 shutdown_event_(shutdown_event),
62 share_group_(new gl::GLShareGroup()), 63 share_group_(new gl::GLShareGroup()),
63 mailbox_manager_(gles2::MailboxManager::Create(gpu_preferences)), 64 mailbox_manager_(gles2::MailboxManager::Create(gpu_preferences)),
64 gpu_memory_manager_(this), 65 gpu_memory_manager_(this),
65 sync_point_manager_(sync_point_manager), 66 sync_point_manager_(sync_point_manager),
66 sync_point_client_waiter_( 67 sync_point_client_waiter_(
67 sync_point_manager->CreateSyncPointClientWaiter()), 68 sync_point_manager->CreateSyncPointClientWaiter()),
68 gpu_memory_buffer_factory_(gpu_memory_buffer_factory), 69 gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 } 286 }
286 } 287 }
287 if (!stub || !stub->decoder()->MakeCurrent()) 288 if (!stub || !stub->decoder()->MakeCurrent())
288 return; 289 return;
289 glFinish(); 290 glFinish();
290 DidAccessGpu(); 291 DidAccessGpu();
291 } 292 }
292 #endif 293 #endif
293 294
294 } // namespace gpu 295 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698