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

Side by Side Diff: android_webview/browser/deferred_gpu_command_service.cc

Issue 1778693002: Revert of Get rid of gpu related switches by passing gpu::GpuPreferences via IPC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | content/browser/android/synchronous_compositor_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "android_webview/browser/deferred_gpu_command_service.h" 5 #include "android_webview/browser/deferred_gpu_command_service.h"
6 6
7 #include "android_webview/browser/gl_view_renderer_manager.h" 7 #include "android_webview/browser/gl_view_renderer_manager.h"
8 #include "android_webview/browser/shared_renderer_state.h" 8 #include "android_webview/browser/shared_renderer_state.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
14 #include "content/public/browser/android/synchronous_compositor.h" 14 #include "content/public/browser/android/synchronous_compositor.h"
15 #include "content/public/browser/gpu_utils.h"
16 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
17 #include "gpu/command_buffer/service/framebuffer_completeness_cache.h" 16 #include "gpu/command_buffer/service/framebuffer_completeness_cache.h"
18 #include "gpu/command_buffer/service/gpu_preferences.h" 17 #include "gpu/command_buffer/service/gpu_preferences.h"
19 #include "gpu/command_buffer/service/gpu_switches.h" 18 #include "gpu/command_buffer/service/gpu_switches.h"
20 #include "gpu/command_buffer/service/shader_translator_cache.h" 19 #include "gpu/command_buffer/service/shader_translator_cache.h"
21 #include "gpu/command_buffer/service/sync_point_manager.h" 20 #include "gpu/command_buffer/service/sync_point_manager.h"
22 #include "gpu/config/gpu_switches.h" 21 #include "gpu/config/gpu_switches.h"
23 #include "ui/gl/gl_switches.h" 22 #include "ui/gl/gl_switches.h"
24 23
25 namespace android_webview { 24 namespace android_webview {
26 25
27 namespace { 26 namespace {
28 base::LazyInstance<scoped_refptr<DeferredGpuCommandService> > 27 base::LazyInstance<scoped_refptr<DeferredGpuCommandService> >
29 g_service = LAZY_INSTANCE_INITIALIZER; 28 g_service = LAZY_INSTANCE_INITIALIZER;
30 29
30 bool GetSizeTFromSwitch(const base::CommandLine* command_line,
31 const base::StringPiece& switch_string,
32 size_t* value) {
33 if (!command_line->HasSwitch(switch_string))
34 return false;
35 std::string switch_value(command_line->GetSwitchValueASCII(switch_string));
36 return base::StringToSizeT(switch_value, value);
37 }
38
39 gpu::GpuPreferences GetGpuPreferencesFromCommandLine() {
40 // TODO(penghuang): share below code with content/gpu/gpu_child_thread.cc
41 // http://crbug.com/590825
42 DCHECK(base::CommandLine::InitializedForCurrentProcess());
43 const base::CommandLine* command_line =
44 base::CommandLine::ForCurrentProcess();
45 gpu::GpuPreferences gpu_preferences;
46 gpu_preferences.single_process =
47 command_line->HasSwitch(switches::kSingleProcess);
48 gpu_preferences.in_process_gpu =
49 command_line->HasSwitch(switches::kInProcessGPU);
50 gpu_preferences.ui_prioritize_in_gpu_process =
51 command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess);
52 gpu_preferences.compile_shader_always_succeeds =
53 command_line->HasSwitch(switches::kCompileShaderAlwaysSucceeds);
54 gpu_preferences.disable_gl_error_limit =
55 command_line->HasSwitch(switches::kDisableGLErrorLimit);
56 gpu_preferences.disable_glsl_translator =
57 command_line->HasSwitch(switches::kDisableGLSLTranslator);
58 gpu_preferences.disable_gpu_driver_bug_workarounds =
59 command_line->HasSwitch(switches::kDisableGpuDriverBugWorkarounds);
60 gpu_preferences.disable_shader_name_hashing =
61 command_line->HasSwitch(switches::kDisableShaderNameHashing);
62 gpu_preferences.enable_gpu_command_logging =
63 command_line->HasSwitch(switches::kEnableGPUCommandLogging);
64 gpu_preferences.enable_gpu_debugging =
65 command_line->HasSwitch(switches::kEnableGPUDebugging);
66 gpu_preferences.enable_gpu_service_logging_gpu =
67 command_line->HasSwitch(switches::kEnableGPUServiceLoggingGPU);
68 gpu_preferences.disable_gpu_program_cache =
69 command_line->HasSwitch(switches::kDisableGpuProgramCache);
70 gpu_preferences.enforce_gl_minimums =
71 command_line->HasSwitch(switches::kEnforceGLMinimums);
72 if (GetSizeTFromSwitch(command_line, switches::kForceGpuMemAvailableMb,
73 &gpu_preferences.force_gpu_mem_available)) {
74 gpu_preferences.force_gpu_mem_available *= 1024 * 1024;
75 }
76 if (GetSizeTFromSwitch(command_line, switches::kGpuProgramCacheSizeKb,
77 &gpu_preferences.gpu_program_cache_size)) {
78 gpu_preferences.gpu_program_cache_size *= 1024;
79 }
80 gpu_preferences.enable_share_group_async_texture_upload =
81 command_line->HasSwitch(switches::kEnableShareGroupAsyncTextureUpload);
82 gpu_preferences.enable_subscribe_uniform_extension =
83 command_line->HasSwitch(switches::kEnableSubscribeUniformExtension);
84 gpu_preferences.enable_threaded_texture_mailboxes =
85 command_line->HasSwitch(switches::kEnableThreadedTextureMailboxes);
86 gpu_preferences.gl_shader_interm_output =
87 command_line->HasSwitch(switches::kGLShaderIntermOutput);
88 gpu_preferences.emulate_shader_precision =
89 command_line->HasSwitch(switches::kEmulateShaderPrecision);
90 gpu_preferences.enable_gpu_service_logging =
91 command_line->HasSwitch(switches::kEnableGPUServiceLogging);
92 gpu_preferences.enable_gpu_service_tracing =
93 command_line->HasSwitch(switches::kEnableGPUServiceTracing);
94 gpu_preferences.enable_unsafe_es3_apis =
95 command_line->HasSwitch(switches::kEnableUnsafeES3APIs);
96 return gpu_preferences;
97 }
98
31 } // namespace 99 } // namespace
32 100
33 base::LazyInstance<base::ThreadLocalBoolean> ScopedAllowGL::allow_gl; 101 base::LazyInstance<base::ThreadLocalBoolean> ScopedAllowGL::allow_gl;
34 102
35 // static 103 // static
36 bool ScopedAllowGL::IsAllowed() { 104 bool ScopedAllowGL::IsAllowed() {
37 return allow_gl.Get().Get(); 105 return allow_gl.Get().Get();
38 } 106 }
39 107
40 ScopedAllowGL::ScopedAllowGL() { 108 ScopedAllowGL::ScopedAllowGL() {
(...skipping 24 matching lines...) Expand all
65 } 133 }
66 } 134 }
67 135
68 // static 136 // static
69 DeferredGpuCommandService* DeferredGpuCommandService::GetInstance() { 137 DeferredGpuCommandService* DeferredGpuCommandService::GetInstance() {
70 DCHECK(g_service.Get().get()); 138 DCHECK(g_service.Get().get());
71 return g_service.Get().get(); 139 return g_service.Get().get();
72 } 140 }
73 141
74 DeferredGpuCommandService::DeferredGpuCommandService() 142 DeferredGpuCommandService::DeferredGpuCommandService()
75 : gpu::InProcessCommandBuffer::Service( 143 : gpu::InProcessCommandBuffer::Service(GetGpuPreferencesFromCommandLine()),
76 content::GetGpuPreferencesFromCommandLine()),
77 sync_point_manager_(new gpu::SyncPointManager(true)) { 144 sync_point_manager_(new gpu::SyncPointManager(true)) {
78 } 145 }
79 146
80 DeferredGpuCommandService::~DeferredGpuCommandService() { 147 DeferredGpuCommandService::~DeferredGpuCommandService() {
81 base::AutoLock lock(tasks_lock_); 148 base::AutoLock lock(tasks_lock_);
82 DCHECK(tasks_.empty()); 149 DCHECK(tasks_.empty());
83 } 150 }
84 151
85 // This method can be called on any thread. 152 // This method can be called on any thread.
86 // static 153 // static
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 273
207 void DeferredGpuCommandService::AddRef() const { 274 void DeferredGpuCommandService::AddRef() const {
208 base::RefCountedThreadSafe<DeferredGpuCommandService>::AddRef(); 275 base::RefCountedThreadSafe<DeferredGpuCommandService>::AddRef();
209 } 276 }
210 277
211 void DeferredGpuCommandService::Release() const { 278 void DeferredGpuCommandService::Release() const {
212 base::RefCountedThreadSafe<DeferredGpuCommandService>::Release(); 279 base::RefCountedThreadSafe<DeferredGpuCommandService>::Release();
213 } 280 }
214 281
215 } // namespace android_webview 282 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/synchronous_compositor_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698