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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder.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
« no previous file with comments | « gpu/command_buffer/service/feature_info.cc ('k') | ui/gl/gl.gyp » ('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 (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/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "gpu/command_buffer/service/shader_translator_cache.h" 55 #include "gpu/command_buffer/service/shader_translator_cache.h"
56 #include "gpu/command_buffer/service/stream_texture.h" 56 #include "gpu/command_buffer/service/stream_texture.h"
57 #include "gpu/command_buffer/service/stream_texture_manager.h" 57 #include "gpu/command_buffer/service/stream_texture_manager.h"
58 #include "gpu/command_buffer/service/texture_manager.h" 58 #include "gpu/command_buffer/service/texture_manager.h"
59 #include "gpu/command_buffer/service/vertex_array_manager.h" 59 #include "gpu/command_buffer/service/vertex_array_manager.h"
60 #include "gpu/command_buffer/service/vertex_attrib_manager.h" 60 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
61 #include "ui/gl/gl_bindings.h" 61 #include "ui/gl/gl_bindings.h"
62 #include "ui/gl/gl_image.h" 62 #include "ui/gl/gl_image.h"
63 #include "ui/gl/gl_implementation.h" 63 #include "ui/gl/gl_implementation.h"
64 #include "ui/gl/gl_surface.h" 64 #include "ui/gl/gl_surface.h"
65
65 #if defined(OS_MACOSX) 66 #if defined(OS_MACOSX)
66 #include "ui/surface/io_surface_support_mac.h" 67 #include "ui/gl/io_surface_support_mac.h"
67 #endif 68 #endif
68 69
69 // TODO(zmo): we can't include "City.h" due to type def conflicts. 70 // TODO(zmo): we can't include "City.h" due to type def conflicts.
70 extern uint64 CityHash64(const char*, size_t); 71 extern uint64 CityHash64(const char*, size_t);
71 72
72 namespace gpu { 73 namespace gpu {
73 namespace gles2 { 74 namespace gles2 {
74 75
75 namespace { 76 namespace {
76 77
(...skipping 10260 matching lines...) Expand 10 before | Expand all | Expand 10 after
10337 return error::kNoError; 10338 return error::kNoError;
10338 } 10339 }
10339 10340
10340 // Include the auto-generated part of this file. We split this because it means 10341 // Include the auto-generated part of this file. We split this because it means
10341 // we can easily edit the non-auto generated parts right here in this file 10342 // we can easily edit the non-auto generated parts right here in this file
10342 // instead of having to edit some template or the code generator. 10343 // instead of having to edit some template or the code generator.
10343 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 10344 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
10344 10345
10345 } // namespace gles2 10346 } // namespace gles2
10346 } // namespace gpu 10347 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/feature_info.cc ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698