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

Side by Side Diff: examples/ganesh_app/texture_uploader.cc

Issue 740923002: Add a simple compositor for Sky (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Address reviewer comments Created 6 years, 1 month 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 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 "examples/ganesh_app/texture_uploader.h" 5 #include "examples/ganesh_app/texture_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 9 #endif
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "gpu/GLES2/gl2chromium.h" 12 #include "gpu/GLES2/gl2chromium.h"
13 #include "gpu/GLES2/gl2extchromium.h" 13 #include "gpu/GLES2/gl2extchromium.h"
14 #include "mojo/public/c/gles2/gles2.h" 14 #include "mojo/public/c/gles2/gles2.h"
15 #include "mojo/public/cpp/application/connect.h" 15 #include "mojo/public/cpp/application/connect.h"
16 #include "mojo/public/interfaces/application/shell.mojom.h" 16 #include "mojo/public/interfaces/application/shell.mojom.h"
17 #include "mojo/services/public/cpp/geometry/geometry_util.h" 17 #include "mojo/services/public/cpp/geometry/geometry_util.h"
18 #include "mojo/services/public/cpp/surfaces/surfaces_utils.h" 18 #include "mojo/services/public/cpp/surfaces/surfaces_utils.h"
19 #include "mojo/services/public/cpp/surfaces/surfaces_utils.h"
20 19
21 namespace examples { 20 namespace examples {
22 21
23 TextureUploader::Client::~Client() { 22 TextureUploader::Client::~Client() {
24 } 23 }
25 24
26 TextureUploader::TextureUploader(Client* client, 25 TextureUploader::TextureUploader(Client* client,
27 mojo::Shell* shell, 26 mojo::Shell* shell,
28 base::WeakPtr<mojo::GLContext> context) 27 base::WeakPtr<mojo::GLContext> context)
29 : client_(client), 28 : client_(client),
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 uint32_t id_namespace) { 165 uint32_t id_namespace) {
167 surface_ = surface.Pass(); 166 surface_ = surface.Pass();
168 surface_.set_client(this); 167 surface_.set_client(this);
169 id_namespace_ = id_namespace; 168 id_namespace_ = id_namespace;
170 169
171 if (pending_upload_) 170 if (pending_upload_)
172 Upload(pending_upload_.Pass()); 171 Upload(pending_upload_.Pass());
173 } 172 }
174 173
175 } // namespace examples 174 } // namespace examples
OLDNEW
« no previous file with comments | « examples/BUILD.gn ('k') | examples/sky_compositor_app/BUILD.gn » ('j') | sky/compositor/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698