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

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

Issue 1227363005: mac: Include <IOSurface/IOSurface.h> instead of <IOSurface/IOSurfaceAPI.h> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/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 <cmath> 10 #include <cmath>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "ui/gfx/overlay_transform.h" 63 #include "ui/gfx/overlay_transform.h"
64 #include "ui/gl/gl_bindings.h" 64 #include "ui/gl/gl_bindings.h"
65 #include "ui/gl/gl_context.h" 65 #include "ui/gl/gl_context.h"
66 #include "ui/gl/gl_fence.h" 66 #include "ui/gl/gl_fence.h"
67 #include "ui/gl/gl_image.h" 67 #include "ui/gl/gl_image.h"
68 #include "ui/gl/gl_implementation.h" 68 #include "ui/gl/gl_implementation.h"
69 #include "ui/gl/gl_surface.h" 69 #include "ui/gl/gl_surface.h"
70 #include "ui/gl/gpu_timing.h" 70 #include "ui/gl/gpu_timing.h"
71 71
72 #if defined(OS_MACOSX) 72 #if defined(OS_MACOSX)
73 #include <IOSurface/IOSurfaceAPI.h> 73 #include <IOSurface/IOSurface.h>
74 // Note that this must be included after gl_bindings.h to avoid conflicts. 74 // Note that this must be included after gl_bindings.h to avoid conflicts.
75 #include <OpenGL/CGLIOSurface.h> 75 #include <OpenGL/CGLIOSurface.h>
76 #endif 76 #endif
77 77
78 namespace gpu { 78 namespace gpu {
79 namespace gles2 { 79 namespace gles2 {
80 80
81 namespace { 81 namespace {
82 82
83 const char kOESDerivativeExtension[] = "GL_OES_standard_derivatives"; 83 const char kOESDerivativeExtension[] = "GL_OES_standard_derivatives";
(...skipping 13615 matching lines...) Expand 10 before | Expand all | Expand 10 after
13699 } 13699 }
13700 } 13700 }
13701 13701
13702 // Include the auto-generated part of this file. We split this because it means 13702 // Include the auto-generated part of this file. We split this because it means
13703 // we can easily edit the non-auto generated parts right here in this file 13703 // we can easily edit the non-auto generated parts right here in this file
13704 // instead of having to edit some template or the code generator. 13704 // instead of having to edit some template or the code generator.
13705 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 13705 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
13706 13706
13707 } // namespace gles2 13707 } // namespace gles2
13708 } // namespace gpu 13708 } // namespace gpu
OLDNEW
« no previous file with comments | « content/common/mac/io_surface_manager.h ('k') | ui/accelerated_widget_mac/accelerated_widget_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698