| Index: examples/ganesh_app/texture_uploader.cc
|
| diff --git a/examples/ganesh_app/texture_uploader.cc b/examples/ganesh_app/texture_uploader.cc
|
| index eb8db39a8d740dfbcc096cbc853faacce2cfc8fc..08d27f1633a1e5c3940cb875b30fa58394ae9845 100644
|
| --- a/examples/ganesh_app/texture_uploader.cc
|
| +++ b/examples/ganesh_app/texture_uploader.cc
|
| @@ -76,7 +76,7 @@ void TextureUploader::Upload(scoped_ptr<mojo::GLTexture> texture) {
|
| mojo::TransferableResourcePtr resource = mojo::TransferableResource::New();
|
| resource->id = next_resource_id_++;
|
| resource_to_texture_map_[resource->id] = texture.release();
|
| - resource->format = mojo::RESOURCE_FORMAT_RGBA_8888;
|
| + resource->format = mojo::ResourceFormat::RGBA_8888;
|
| resource->filter = GL_LINEAR;
|
| resource->size = size.Clone();
|
| mojo::MailboxHolderPtr mailbox_holder = mojo::MailboxHolder::New();
|
| @@ -90,7 +90,7 @@ void TextureUploader::Upload(scoped_ptr<mojo::GLTexture> texture) {
|
| resource->is_software = false;
|
|
|
| mojo::QuadPtr quad = mojo::Quad::New();
|
| - quad->material = mojo::MATERIAL_TEXTURE_CONTENT;
|
| + quad->material = mojo::Material::TEXTURE_CONTENT;
|
|
|
| mojo::RectPtr rect = mojo::Rect::New();
|
| rect->width = size.width;
|
|
|