← Back to branch summary

~vanvugt/mir/render-focus

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/android/test_hwc_display.cpp

  • Committer: Tarmac
  • Author(s): Alexandros Frantzis
  • Date: 2014-03-31 13:20:44 UTC
  • mfrom: (1513.1.1 android-gl-config)
  • Revision ID: tarmac-20140331132044-oxpv8kzzbn20f8i3
android: Respect GLConfig preferences.

Approved by Alan Griffiths, Kevin DuBois, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/android/test_hwc_display.cpp
28
28
#include "mir_test_doubles/stub_driver_interpreter.h"
29
29
#include "mir_test_doubles/stub_display_buffer.h"
30
30
#include "mir_test_doubles/stub_buffer.h"
 
31
#include "mir_test_doubles/stub_gl_config.h"
31
32
#include "mir_test_doubles/mock_framebuffer_bundle.h"
32
33
#include <memory>
33
34
 
50
51
        dummy_config = mock_egl.fake_configs[0];
51
52
        dummy_context = mock_egl.fake_egl_context;
52
53
        testing::NiceMock<mtd::MockDisplayReport> report;
53
 
        gl_context = std::make_shared<mga::GLContext>(mga::to_mir_format(mock_egl.fake_visual_id),report);
 
54
        mtd::StubGLConfig stub_gl_config;
 
55
 
 
56
        gl_context = std::make_shared<mga::GLContext>(
 
57
            mga::to_mir_format(mock_egl.fake_visual_id), stub_gl_config, report);
 
58
 
54
59
        mock_fb_bundle = std::make_shared<testing::NiceMock<mtd::MockFBBundle>>();
55
60
 
56
61
        ON_CALL(*mock_fb_bundle, fb_format())