diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-02-23 21:03:52 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-17 10:14:45 +0100 |
| commit | af3566c8d973873bd8730c304bec8de770ab489f (patch) | |
| tree | 86fba04c7997d32ceee7cf98cd6f91bb9332f653 | |
| parent | 5bbf1dc6a3285b90cbaa57062604e00829ff0e7b (diff) | |
| download | qtwebengine-chromium-af3566c8d973873bd8730c304bec8de770ab489f.tar.gz | |
Do not add glType to command line again
Skip setting up again glType as for in-process gpu
command_line = browser_command_line in AppendGpuCommandLine.
Note this is not an issue if gpu runs as it own process as
command_line != browser_command_line in that case.
glType is only set by web engine context creation.
Task-number: QTBUG-100713
Change-Id: I1c3a703a2ed27fb72714dbcae75e6bd7d00abf9d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/content/browser/gpu/gpu_data_manager_impl_private.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc b/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc index cddf8dfa73b..c0eda62c4ad 100644 --- a/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -1332,6 +1332,11 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine( command_line->AppendSwitchASCII(switches::kGpuPreferences, gpu_prefs.ToSwitchValue()); + // do not reappend in case of same process + if (command_line->HasSwitch(switches::kSingleProcess) || + command_line->HasSwitch(switches::kInProcessGPU)) + return; + std::string use_gl; switch (gpu_mode_) { case gpu::GpuMode::HARDWARE_GL: |