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

Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources. (Closed)

Created:
5 years, 8 months ago by tfarina
Modified:
5 years, 7 months ago
Reviewers:
Zhenyao Mo, no sievers
CC:
chromium-reviews, piman+watch_chromium.org, Dirk Pranke
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

gpu: Fix dependency cycle between service_sources and config_sources. ERROR Dependency cycle: //gpu/command_buffer/service:service_sources -> //gpu/config:config_sources -> //gpu/command_buffer/service:service_sources The problem was that gpu/command_buffer/service already include from gpu/config, but gpu/config were also including from gpu/command_buffer/service for gpu_switches.h, creating the above dependency cycle. By moving the required switch down to gpu/config, we broke this dependency cycle. With that 'gn check' passes for gpu/config with the following command lines: $ gn gen out-gn/Debug $ gn check out-gn/Debug //gpu/config/* gpu/command_buffer/service needs more work to pass 'gn check' though. BUG=367595, 376000 TEST=see above R=sievers@chromium.org Committed: https://crrev.com/15525c4fa7633018873aa4fec407a14c5cf64840 Cr-Commit-Position: refs/heads/master@{#327344}

Patch Set 1 #

Patch Set 2 : fix content #

Patch Set 3 : another content fix #

Patch Set 4 : #

Patch Set 5 : fix static build? #

Patch Set 6 : I forgot the principal - sevice_sources in gpu/config/BUILD.gn #

Patch Set 7 : hacky #

Total comments: 4

Patch Set 8 : zmo nits #

Unified diffs Side-by-side diffs Delta from patch set Stats (+29 lines, -26 lines) Patch
M content/browser/gpu/gpu_data_manager_impl_private.cc View 1 1 chunk +1 line, -0 lines 0 comments Download
M content/browser/gpu/gpu_data_manager_impl_private_unittest.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M content/gpu/gpu_main.cc View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M gpu/command_buffer/service/BUILD.gn View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M gpu/command_buffer/service/feature_info.cc View 1 chunk +1 line, -0 lines 0 comments Download
M gpu/command_buffer/service/feature_info_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc View 1 chunk +1 line, -1 line 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc View 1 chunk +1 line, -2 lines 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc View 1 chunk +1 line, -2 lines 0 comments Download
M gpu/command_buffer/service/gpu_switches.h View 1 2 3 4 5 6 7 3 chunks +1 line, -2 lines 0 comments Download
M gpu/command_buffer/service/gpu_switches.cc View 1 2 3 4 5 6 7 2 chunks +2 lines, -4 lines 0 comments Download
M gpu/command_buffer/tests/gl_clear_framebuffer_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M gpu/config/BUILD.gn View 1 2 3 4 5 2 chunks +2 lines, -1 line 0 comments Download
A + gpu/config/gpu_switches.h View 1 chunk +6 lines, -4 lines 0 comments Download
A + gpu/config/gpu_switches.cc View 1 chunk +3 lines, -5 lines 0 comments Download
M gpu/config/gpu_util.cc View 1 chunk +1 line, -1 line 0 comments Download
M gpu/gpu.gyp View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M gpu/gpu_config.gypi View 1 chunk +2 lines, -0 lines 0 comments Download

Messages

Total messages: 14 (3 generated)
tfarina
5 years, 8 months ago (2015-04-27 22:44:40 UTC) #1
no sievers
lgtm if zmo@ is happy too
5 years, 8 months ago (2015-04-28 00:12:37 UTC) #3
Zhenyao Mo
It's still failing a lot of bots. Be happy to review it when the bots ...
5 years, 8 months ago (2015-04-28 00:18:18 UTC) #4
tfarina
Wait, I don't have gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_lost.cc in my checkout. Is it coming from src-internal?
5 years, 8 months ago (2015-04-28 01:54:28 UTC) #5
tfarina
Zhenyao, bots are all green now. PTAL.
5 years, 8 months ago (2015-04-28 03:23:49 UTC) #6
Zhenyao Mo
LGTM with nits https://codereview.chromium.org/1103403002/diff/120001/gpu/command_buffer/service/gpu_switches.cc File gpu/command_buffer/service/gpu_switches.cc (right): https://codereview.chromium.org/1103403002/diff/120001/gpu/command_buffer/service/gpu_switches.cc#newcode8 gpu/command_buffer/service/gpu_switches.cc:8: #include "gpu/config/gpu_switches.h" nit: No need because ...
5 years, 7 months ago (2015-04-28 16:41:28 UTC) #7
tfarina
https://codereview.chromium.org/1103403002/diff/120001/gpu/command_buffer/service/gpu_switches.cc File gpu/command_buffer/service/gpu_switches.cc (right): https://codereview.chromium.org/1103403002/diff/120001/gpu/command_buffer/service/gpu_switches.cc#newcode8 gpu/command_buffer/service/gpu_switches.cc:8: #include "gpu/config/gpu_switches.h" On 2015/04/28 16:41:28, Zhenyao Mo wrote: > ...
5 years, 7 months ago (2015-04-28 18:07:23 UTC) #8
tfarina
5 years, 7 months ago (2015-04-28 18:07:24 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1103403002/140001
5 years, 7 months ago (2015-04-28 18:08:39 UTC) #12
commit-bot: I haz the power
Committed patchset #8 (id:140001)
5 years, 7 months ago (2015-04-28 19:04:33 UTC) #13
commit-bot: I haz the power
5 years, 7 months ago (2015-04-28 19:05:22 UTC) #14
Message was sent while issue was closed.
Patchset 8 (id:??) landed as
https://crrev.com/15525c4fa7633018873aa4fec407a14c5cf64840
Cr-Commit-Position: refs/heads/master@{#327344}

Powered by Google App Engine
This is Rietveld 408576698