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

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/test_graphics_platform.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-01-08 02:04:38 UTC
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20140108020438-e1npu0pm7qdv5wc4
Tags: upstream-0.1.3+14.04.20140108
ImportĀ upstreamĀ versionĀ 0.1.3+14.04.20140108

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
#include "mir_test_doubles/mock_drm.h"
27
27
#include "mir_test_doubles/mock_gbm.h"
28
28
#include "mir_test_doubles/null_virtual_terminal.h"
29
 
#include "src/server/graphics/gbm/gbm_platform.h"
 
29
#include "src/platform/graphics/mesa/platform.h"
30
30
#include "mir_test_framework/udev_environment.h"
31
31
#else
32
32
#include "mir_test_doubles/mock_android_hw.h"
84
84
#ifdef ANDROID
85
85
        return mg::create_platform(std::make_shared<mo::ProgramOption>(), std::make_shared<mg::NullDisplayReport>());
86
86
#else
87
 
        return std::make_shared<mg::gbm::GBMPlatform>(
 
87
        return std::make_shared<mg::mesa::Platform>(
88
88
            std::make_shared<mg::NullDisplayReport>(),
89
89
            std::make_shared<mir::test::doubles::NullVirtualTerminal>());
90
90
#endif
126
126
    ASSERT_NE(0u, supported_pixel_formats.size());
127
127
 
128
128
    geom::Size size{320, 240};
129
 
    geom::PixelFormat const pf{supported_pixel_formats[0]};
 
129
    MirPixelFormat const pf{supported_pixel_formats[0]};
130
130
    mg::BufferUsage usage{mg::BufferUsage::hardware};
131
131
    mg::BufferProperties buffer_properties{size, pf, usage};
132
132