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

Side by Side Diff: gpu/command_buffer/service/feature_info.cc

Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zmo nits Created 5 years, 7 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/command_buffer/service/feature_info.h" 5 #include "gpu/command_buffer/service/feature_info.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_split.h" 13 #include "base/strings/string_split.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "gpu/command_buffer/service/gl_utils.h" 15 #include "gpu/command_buffer/service/gl_utils.h"
16 #include "gpu/command_buffer/service/gpu_switches.h" 16 #include "gpu/command_buffer/service/gpu_switches.h"
17 #include "gpu/config/gpu_switches.h"
17 #include "ui/gl/gl_fence.h" 18 #include "ui/gl/gl_fence.h"
18 #include "ui/gl/gl_implementation.h" 19 #include "ui/gl/gl_implementation.h"
19 20
20 #if !defined(OS_MACOSX) 21 #if !defined(OS_MACOSX)
21 #include "ui/gl/gl_fence_egl.h" 22 #include "ui/gl/gl_fence_egl.h"
22 #endif 23 #endif
23 24
24 namespace gpu { 25 namespace gpu {
25 namespace gles2 { 26 namespace gles2 {
26 27
(...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 if (pos == std::string::npos) { 1187 if (pos == std::string::npos) {
1187 extensions_ += (extensions_.empty() ? "" : " ") + str; 1188 extensions_ += (extensions_.empty() ? "" : " ") + str;
1188 } 1189 }
1189 } 1190 }
1190 1191
1191 FeatureInfo::~FeatureInfo() { 1192 FeatureInfo::~FeatureInfo() {
1192 } 1193 }
1193 1194
1194 } // namespace gles2 1195 } // namespace gles2
1195 } // namespace gpu 1196 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/BUILD.gn ('k') | gpu/command_buffer/service/feature_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698