← Back to branch summary

~raof/mir/link-platforms-against-mirplatform

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp

  • Committer: Tarmac
  • Author(s): Andreas Pokorny
  • Date: 2014-09-08 09:38:49 UTC
  • mfrom: (1851.10.6 test-for-native-pixmap)
  • Revision ID: tarmac-20140908093849-dovj5a753b207fes
Tags: br0.8
Replace checks for MESA_drm_image with KHR_image_pixmap and disables the checks

The former could be used to create EGLImages from DRM buffer handles with new function called eglCreateDRMImageMESA. While the latter allows passing a native handle to eglCreateImage to initialize an EGLImage. We use only the latter and implement that behavior inside mir platform in mesa. But at the moment that extension is not indicated through mesas extension string, hence it will be disabled for now.

Approved by PS Jenkins bot, Alberto Aguirre, Daniel van Vugt, Cemil Azizoglu, Alexandros Frantzis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp
49
49
            .WillByDefault(DoAll(SetArgPointee<2>(mock_egl.fake_configs[0]),
50
50
                                 SetArgPointee<4>(1),
51
51
                                 Return(EGL_TRUE)));
52
 
 
53
 
        const char* const egl_exts = "EGL_KHR_image EGL_KHR_image_base";
54
 
        const char* const gl_exts = "GL_OES_EGL_image";
55
 
 
56
 
        ON_CALL(mock_egl, eglQueryString(_,EGL_EXTENSIONS))
57
 
            .WillByDefault(Return(egl_exts));
58
 
        ON_CALL(mock_gl, glGetString(GL_EXTENSIONS))
59
 
            .WillByDefault(Return(reinterpret_cast<const GLubyte*>(gl_exts)));
 
52
        mock_egl.provide_egl_extensions();
 
53
        mock_gl.provide_gles_extensions();
 
54
 
60
55
        ON_CALL(mock_gl, glCheckFramebufferStatus(_))
61
56
            .WillByDefault(Return(GL_FRAMEBUFFER_COMPLETE));
62
57
    }