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

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

Issue 17381009: Move io_surface_support_mac to ui/gl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ui-gyp: fixbuild Created 7 years, 6 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 | Annotate | Revision Log
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/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/string_split.h" 11 #include "base/strings/string_split.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "gpu/command_buffer/service/gl_utils.h" 13 #include "gpu/command_buffer/service/gl_utils.h"
14 #include "gpu/command_buffer/service/gpu_switches.h" 14 #include "gpu/command_buffer/service/gpu_switches.h"
15 #include "ui/gl/gl_implementation.h" 15 #include "ui/gl/gl_implementation.h"
16
16 #if defined(OS_MACOSX) 17 #if defined(OS_MACOSX)
17 #include "ui/surface/io_surface_support_mac.h" 18 #include "ui/gl/io_surface_support_mac.h"
18 #endif 19 #endif
19 20
20 namespace gpu { 21 namespace gpu {
21 namespace gles2 { 22 namespace gles2 {
22 23
23 namespace { 24 namespace {
24 25
25 struct FormatInfo { 26 struct FormatInfo {
26 GLenum format; 27 GLenum format;
27 const GLenum* types; 28 const GLenum* types;
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 if (extensions_.find(str) == std::string::npos) { 644 if (extensions_.find(str) == std::string::npos) {
644 extensions_ += (extensions_.empty() ? "" : " ") + str; 645 extensions_ += (extensions_.empty() ? "" : " ") + str;
645 } 646 }
646 } 647 }
647 648
648 FeatureInfo::~FeatureInfo() { 649 FeatureInfo::~FeatureInfo() {
649 } 650 }
650 651
651 } // namespace gles2 652 } // namespace gles2
652 } // namespace gpu 653 } // namespace gpu
OLDNEW
« no previous file with comments | « content/plugin/webplugin_accelerated_surface_proxy_mac.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698