← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to src/server/graphics/program_factory.cpp

  • Committer: Package Import Robot
  • Author(s): CI Train Bot
  • Date: 2015-05-12 13:12:55 UTC
  • mto: This revision was merged to the branch mainline in revision 96.
  • Revision ID: package-import@ubuntu.com-20150512131255-y7z12i8n4pbvo70x
Tags: upstream-0.13.0+15.10.20150512
Import upstream version 0.13.0+15.10.20150512

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/graphics/program_factory.cpp
29
29
    std::string const& fragment_shader) const
30
30
{
31
31
    std::lock_guard<decltype(mutex)> lock(mutex);
32
 
    return std::unique_ptr<mg::GLProgram>(
33
 
        new SimpleGLProgram(vertex_shader.c_str(), fragment_shader.c_str()));
 
32
    return std::make_unique<SimpleGLProgram>(
 
33
        vertex_shader.c_str(), fragment_shader.c_str());
34
34
}
35
35
 
36
36
std::unique_ptr<mg::GLTextureCache> mg::ProgramFactory::create_texture_cache() const
37
37
{
38
 
    return std::unique_ptr<mg::GLTextureCache>(
39
 
        new mir::compositor::RecentlyUsedCache());
 
38
    return std::make_unique<mir::compositor::RecentlyUsedCache>();
40
39
}