| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/services/public/cpp/view_manager/lib/bitmap_uploader.h" | 5 #include "mojo/services/public/cpp/view_manager/lib/bitmap_uploader.h" |
| 6 | 6 |
| 7 #ifndef GL_GLEXT_PROTOTYPES | 7 #ifndef GL_GLEXT_PROTOTYPES |
| 8 #define GL_GLEXT_PROTOTYPES | 8 #define GL_GLEXT_PROTOTYPES |
| 9 #endif // GL_GLEXT_PROTOTYPES | 9 #endif // GL_GLEXT_PROTOTYPES |
| 10 | 10 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "cc/surfaces/surface_id.h" | 12 #include "cc/surfaces/surface_id.h" |
| 13 #include "cc/surfaces/surface_id_allocator.h" | 13 #include "cc/surfaces/surface_id_allocator.h" |
| 14 #include "gpu/GLES2/gl2chromium.h" | 14 #include "gpu/GLES2/gl2chromium.h" |
| 15 #include "gpu/GLES2/gl2extchromium.h" | 15 #include "gpu/GLES2/gl2extchromium.h" |
| 16 #include "gpu/command_buffer/common/mailbox.h" | 16 #include "gpu/command_buffer/common/mailbox.h" |
| 17 #include "mojo/public/c/gles2/gles2.h" |
| 17 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" | 18 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
| 18 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" | 19 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" |
| 19 #include "mojo/services/public/cpp/surfaces/surfaces_utils.h" | 20 #include "mojo/services/public/cpp/surfaces/surfaces_utils.h" |
| 20 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h" | 21 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h" |
| 21 #include "third_party/khronos/GLES2/gl2.h" | 22 #include "third_party/khronos/GLES2/gl2.h" |
| 22 #include "ui/gfx/geometry/rect.h" | 23 #include "ui/gfx/geometry/rect.h" |
| 23 | 24 |
| 24 namespace mojo { | 25 namespace mojo { |
| 25 | 26 |
| 26 namespace { | 27 namespace { |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 size.height(), | 223 size.height(), |
| 223 0, | 224 0, |
| 224 TextureFormat(), | 225 TextureFormat(), |
| 225 GL_UNSIGNED_BYTE, | 226 GL_UNSIGNED_BYTE, |
| 226 0); | 227 0); |
| 227 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); | 228 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); |
| 228 return texture; | 229 return texture; |
| 229 } | 230 } |
| 230 | 231 |
| 231 } // namespace mojo | 232 } // namespace mojo |
| OLD | NEW |