← Back to branch summary

~hikiko/mir/mir.unity8-desktop-session

« back to all changes in this revision

Viewing changes to src/server/compositor/default_configuration.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Daniel van Vugt, Ubuntu daily release
  • Date: 2014-01-08 02:04:38 UTC
  • mfrom: (1.1.54)
  • Revision ID: package-import@ubuntu.com-20140108020438-ikbu7qqm9v2l026y
Tags: 0.1.3+14.04.20140108-0ubuntu1
[ Daniel van Vugt ]
* Preparing for release 0.1.3

[ Ubuntu daily release ]
* Automatic snapshot from revision 1170

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/compositor/default_configuration.cpp
20
20
#include "buffer_stream_factory.h"
21
21
#include "default_display_buffer_compositor_factory.h"
22
22
#include "multi_threaded_compositor.h"
23
 
#include "overlay_renderer.h"
24
23
#include "gl_renderer_factory.h"
25
24
 
26
25
namespace mc = mir::compositor;
43
42
        [this]()
44
43
        {
45
44
            return std::make_shared<mc::DefaultDisplayBufferCompositorFactory>(
46
 
                the_scene(), the_renderer_factory(), the_overlay_renderer());
 
45
                the_scene(), the_renderer_factory());
47
46
        });
48
47
}
49
48
 
59
58
        });
60
59
}
61
60
 
62
 
std::shared_ptr<mc::OverlayRenderer>
63
 
mir::DefaultServerConfiguration::the_overlay_renderer()
64
 
{
65
 
    struct NullOverlayRenderer : public mc::OverlayRenderer
66
 
    {
67
 
        virtual void render(
68
 
            geometry::Rectangle const&,
69
 
            std::function<void(std::shared_ptr<void> const&)>) {}
70
 
    };
71
 
    return overlay_renderer(
72
 
        [this]()
73
 
        {
74
 
            return std::make_shared<NullOverlayRenderer>();
75
 
        });
76
 
}
77
 
 
78
61
std::shared_ptr<mc::RendererFactory> mir::DefaultServerConfiguration::the_renderer_factory()
79
62
{
80
63
    return renderer_factory(