Mir

Merge lp:~raof/mir/check-for-surfaceless into lp:mir

check-for-surfaceless
Merge into development-branch

Proposed by Chris Halse Rogers on 2013-12-11

Status:

Merged

Approved by:

Alan Griffiths on 2013-12-19

Approved revision:

no longer in the source branch.

Merged at revision:

1297

Proposed branch:

lp:~raof/mir/check-for-surfaceless

Merge into:

lp:mir

Diff against target:

928 lines (+406/-151)

21 files modified

include/platform/mir/graphics/gl_context.h (+2/-2)
include/server/mir/graphics/gl_extensions_base.h (+3/-6)
include/server/mir/graphics/surfaceless_egl_context.h (+11/-10)
include/test/mir_test_doubles/null_gl_context.h (+2/-2)
src/platform/graphics/android/gl_context.cpp (+2/-2)
src/platform/graphics/android/gl_context.h (+2/-2)
src/platform/graphics/mesa/display.cpp (+2/-2)
src/platform/graphics/mesa/display_helpers.cpp (+2/-2)
src/platform/graphics/mesa/display_helpers.h (+2/-2)
src/server/graphics/CMakeLists.txt (+2/-0)
src/server/graphics/gl_extensions_base.cpp (+4/-4)
src/server/graphics/nested/nested_display.cpp (+4/-45)
src/server/graphics/offscreen/CMakeLists.txt (+0/-2)
src/server/graphics/offscreen/display.cpp (+1/-29)
src/server/graphics/offscreen/display.h (+1/-1)
src/server/graphics/offscreen/display_buffer.cpp (+3/-3)
src/server/graphics/offscreen/display_buffer.h (+1/-1)
src/server/graphics/surfaceless_egl_context.cpp (+103/-32)
tests/unit-tests/graphics/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/test_surfaceless_egl_context.cpp (+254/-0)
tests/unit-tests/scene/test_gl_pixel_buffer.cpp (+4/-4)

To merge this branch:

bzr merge lp:~raof/mir/check-for-surfaceless

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Status
PS Jenkins bot (community)	continuous-integration	Approve on 2013-12-19
Daniel van Vugt		Approve on 2013-12-19
Alexandros Frantzis (community)		Abstain on 2013-12-18
Chris Halse Rogers		Approve on 2013-12-13
Andreas Pokorny (community)		Approve on 2013-12-12
Review via email: mp+198510@code.launchpad.net

Commit message

nested: Check for, and prefer, EGL_KHR_surfaceless_context over dummy pbuffer surfaces

It seems that at least one of our Android stacks doesn't support
EGL_KHR_surfaceless_context, and Mesa doesn't support pbuffer surfaces.

Fixes nested on Mesa (LP: #1260635)

Description of the change

nested: Check for, and prefer, EGL_KHR_surfaceless_context over dummy pbuffer surfaces

It seems that at least one of our Android stacks doesn't support EGL_KHR_surfaceless_context,
and Mesa doesn't support pbuffer surfaces.

Fixes nested on Mesa

Revision history for this message

Chris Halse Rogers (raof) wrote on 2013-12-11:

Note: I'm in the process of testing nested on Android. Although I don't see how this would fail on Android, it'd be courteous to check that nested still works before top approving this :)

review: Needs Information

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-12-11:

Looks good, if you ignore what C++ forces us to do with initializer lists :(

Nit: Missing an underscore:
31 + (khr_surfaceless_context ? " (using EGL_KHR_surfaceless context)\n" :

review: Approve

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2013-12-11:

I think

16 + khr_surfaceless_context(strstr(eglQueryString(egl_display, EGL_EXTENSIONS), "EGL_KHR_surfaceless_context") != nullptr)
wants to be a utility function for querying egl extension existance

You could also turn
20 + egl_surface( .... )

into
egl_surface( EGLSurfaceStore::create_dummy_surface(egl_display, egl_config, khr_surfaceless_context) )

and evade control flow in the initializer list.

-> yay and that would be my first launchpad review.

review: Needs Fixing

Revision history for this message

Chris Halse Rogers (raof) wrote on 2013-12-11:

Ok, confirmed that this doesn't break android. Time to address some reviews!

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2013-12-11:

You might also want to take a look at graphics/offscreen/surfaceless_egl_context.cpp and friends, which already provide the needed functionality.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/515/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/523/rebuild

review: Approve (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2013-12-12:

looks fine to me

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-13:

FAILED: Continuous integration, rev:1290
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/529/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/419
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/258/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/529/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2013-12-13:

Now really tested on Android (I didn't know you could run two different mir_demo_server_shells against the hardware simultaneously!), and with some tests. That pass!

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-12-13:

Verified nesting now works on desktop (LP: #1260635)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/531/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/533/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-12-16:

Only minor issues...

1. Typo:
77 + /* We have to explicitly define this, as GLContext has a deleted copy construtor */

2. constness of make_current/release_current; I don't think this is necessary and doesn't look very natural to make such operations const. The ability to make them const is probably only because they're implemented using non-C++ objects (EGL). It seems likely they might have to lose the constness at some point in future following other changes.

3. while (parentheses_dont_match_mir_stye) {
needs_fixing
}
I prefer this style, but it's too much of an obvious deviation from the Mir project style.

4. Unreadably long identifiers:
768 +TEST_F(SurfacelessEGLContextTest, RequestsPBufferWhenNoSurfacelessAndAttribsDoesNotContainSurfaceSpecifier)
787 +TEST_F(SurfacelessEGLContextTest, RequestsPBufferWhenNoSurfacelessAndAttribsContainsNonPBufferSurfaceType)
On that theme, so are lines longer than 80 columns.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/539/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2013-12-16:

578 +mg::SurfacelessEGLContext::SurfacelessEGLContext(

587 +mg::SurfacelessEGLContext::SurfacelessEGLContext(
588 + EGLDisplay egl_display,
589 + EGLint const* attribs,
590 + EGLContext shared_context)

It would be clearer to implement the SurfaceEGLContext(egl_display, shared_context) constructor in terms of the new SurfaceEGLContext(egl_display, attribs, shared_context) constructor, by passing our default config attribs:

SurfacelessEGLContext(EGLDisplay egl_display, EGLContext shared_context)
: SurfacelessEGLContext(egl_display, default_attribs, shared_context)

429 +mgo::DisplayBuffer::DisplayBuffer(SurfacelessEGLContext &&egl_context,
430 geom::Rectangle const& area)
431 - : egl_context{std::move(egl_context)},
432 + : egl_context{std::forward<SurfacelessEGLContext>(egl_context)},

It's better to accept a move only type (such as SurfacelessEGLContext or std::unique_ptr<>) by value vs rvalue reference: see https://code.launchpad.net/~rocket-scientists/mir/buffer-swapper-multi/+merge/139127/comments/301713 .

Also, with this code, since the egl_context parameter is an rvalue reference, not a universal reference, using std::forward doesn't offer any benefits over using std::move.

613 + move.egl_display = EGL_NO_DISPLAY;

618 + release_current();

A invalidated (i.e. moved) SurfacelessEGLContext object may try to release the EGL context when being destroyed. Although this will have no effect since egl_display == EGL_NO_DISPLAY, I think it would be better to not try at all to avoid error/debug messages from EGL.

review: Needs Fixing

Revision history for this message

Chris Halse Rogers (raof) wrote on 2013-12-17:

On Mon, 2013-12-16 at 11:40 +0000, Alexandros Frantzis wrote:
> Review: Needs Fixing
>
> 578 +mg::SurfacelessEGLContext::SurfacelessEGLContext(
>
> 587 +mg::SurfacelessEGLContext::SurfacelessEGLContext(
> 588 + EGLDisplay egl_display,
> 589 + EGLint const* attribs,
> 590 + EGLContext shared_context)
>
> It would be clearer to implement the SurfaceEGLContext(egl_display, shared_context) constructor in terms of the new SurfaceEGLContext(egl_display, attribs, shared_context) constructor, by passing our default config attribs:
>
> SurfacelessEGLContext(EGLDisplay egl_display, EGLContext shared_context)
> : SurfacelessEGLContext(egl_display, default_attribs, shared_context)
>

Quite true! Fixed.

> 429 +mgo::DisplayBuffer::DisplayBuffer(SurfacelessEGLContext &&egl_context,
> 430 geom::Rectangle const& area)
> 431 - : egl_context{std::move(egl_context)},
> 432 + : egl_context{std::forward<SurfacelessEGLContext>(egl_context)},
>
> It's better to accept a move only type (such as SurfacelessEGLContext or std::unique_ptr<>) by value vs rvalue reference: see https://code.launchpad.net/~rocket-scientists/mir/buffer-swapper-multi/+merge/139127/comments/301713 .

Done.
>
> 613 + move.egl_display = EGL_NO_DISPLAY;
>
> 618 + release_current();
>
> A invalidated (i.e. moved) SurfacelessEGLContext object may try to release the EGL context when being destroyed. Although this will have no effect since egl_display == EGL_NO_DISPLAY, I think it would be better to not try at all to avoid error/debug messages from EGL.

Oh, right. If there's no current context then it'll attempt to release.
Fixed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/544/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2013-12-18:

Looks good overall, with the exception of some brace placement style issues in the tests.

Abstaining in order not to block this MP.

review: Abstain

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-12-19:

Still too many "minor issues". See my previous comment. This includes some braces still not fixed.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/561/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-12-19:

I'm not going to block on a couple of minor issues, but there are still more than a couple. Fix half-ish and I'm happy :)

3. Braces you missed - bzr diff | egrep '^\+.*[^ ]+ {$'
+EGLint const default_attr[] = {
+namespace {
+ if (found_surface_type) {
+ const EGLint attribs_with_pbuffer[] = {
+ const EGLint attribs_without_surface_type[] = {
+ const EGLint attribs_without_pbuffer[] = {
+ const EGLint attribs_without_surface_type[] = {
+ const EGLint attribs_with_surface_type[] = {

2. I would prefer they're not const.

4. Use your imagination. You know more about the context than I do.

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2013-12-19:

OK, enough back and forth.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/562/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/564/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Chris Halse Rogers

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'include/platform/mir/graphics/gl_context.h'
 --- include/platform/mir/graphics/gl_context.h	2013-12-17 18:24:51 +0000
 +++ include/platform/mir/graphics/gl_context.h	2013-12-19 09:13:25 +0000
@@ -29,8 +29,8 @@
  public:
      virtual ~GLContext() = default;
--    virtual void make_current() = 0;
--    virtual void release_current() = 0;
++    virtual void make_current() const = 0;
++    virtual void release_current() const = 0;
  protected:
      GLContext() = default;
 === renamed file 'src/server/graphics/offscreen/gl_extensions_base.h' => 'include/server/mir/graphics/gl_extensions_base.h'
 --- src/server/graphics/offscreen/gl_extensions_base.h	2013-11-12 17:23:53 +0000
 +++ include/server/mir/graphics/gl_extensions_base.h	2013-12-19 09:13:25 +0000
@@ -16,15 +16,13 @@
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
--#ifndef MIR_GRAPHICS_OFFSCREEN_GL_EXTENSIONS_BASE_H_
--#define MIR_GRAPHICS_OFFSCREEN_GL_EXTENSIONS_BASE_H_
++#ifndef MIR_GRAPHICS_GL_EXTENSIONS_BASE_H_
++#define MIR_GRAPHICS_GL_EXTENSIONS_BASE_H_
  namespace mir
+ {
  namespace graphics
+ {
--namespace offscreen
--{
  class GLExtensionsBase
+ {
@@ -42,6 +40,5 @@
+ }
+ }
--}
--#endif /* MIR_GRAPHICS_OFFSCREEN_GL_EXTENSIONS_BASE_H_ */
++#endif /* MIR_GRAPHICS_GL_EXTENSIONS_BASE_H_ */
 === renamed file 'src/server/graphics/offscreen/surfaceless_egl_context.h' => 'include/server/mir/graphics/surfaceless_egl_context.h'
 --- src/server/graphics/offscreen/surfaceless_egl_context.h	2013-11-12 17:23:53 +0000
 +++ include/server/mir/graphics/surfaceless_egl_context.h	2013-12-19 09:13:25 +0000
@@ -16,10 +16,11 @@
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
--#ifndef MIR_GRAPHICS_OFFSCREEN_SURFACELESS_EGL_CONTEXT_H_
--#define MIR_GRAPHICS_OFFSCREEN_SURFACELESS_EGL_CONTEXT_H_
++#ifndef MIR_GRAPHICS_SURFACELESS_EGL_CONTEXT_H_
++#define MIR_GRAPHICS_SURFACELESS_EGL_CONTEXT_H_
  #include "mir/graphics/egl_resources.h"
++#include "mir/graphics/gl_context.h"
  #include <EGL/egl.h>
@@ -27,17 +28,18 @@
+ {
  namespace graphics
+ {
--namespace offscreen
--{
--class SurfacelessEGLContext
++class SurfacelessEGLContext : public GLContext
+ {
  public:
      SurfacelessEGLContext(EGLDisplay egl_display, EGLContext shared_context);
--    SurfacelessEGLContext(SurfacelessEGLContext&&) = default;
++    SurfacelessEGLContext(EGLDisplay egl_display, EGLint const* attribs, EGLContext shared_context);
++    /* We have to explicitly define this, as GLContext has a deleted copy constructor */
++    SurfacelessEGLContext(SurfacelessEGLContext&& move);
++    virtual ~SurfacelessEGLContext() noexcept;
--    void make_current() const;
--    void release_current() const;
++    void make_current() const override;
++    void release_current() const override;
      operator EGLContext() const;
@@ -54,6 +56,5 @@
+ }
+ }
--}
--#endif /* MIR_GRAPHICS_OFFSCREEN_SURFACELESS_EGL_SURFACE_H_ */
++#endif /* MIR_GRAPHICS_SURFACELESS_EGL_SURFACE_H_ */
 === modified file 'include/test/mir_test_doubles/null_gl_context.h'
 --- include/test/mir_test_doubles/null_gl_context.h	2013-06-12 10:27:50 +0000
 +++ include/test/mir_test_doubles/null_gl_context.h	2013-12-19 09:13:25 +0000
@@ -31,8 +31,8 @@
  class NullGLContext : public graphics::GLContext
+ {
  public:
--    void make_current() {}
--    void release_current() {}
++    void make_current() const {}
++    void release_current() const {}
  };
+ }
 === modified file 'src/platform/graphics/android/gl_context.cpp'
 --- src/platform/graphics/android/gl_context.cpp	2013-12-17 18:24:51 +0000
 +++ src/platform/graphics/android/gl_context.cpp	2013-12-19 09:13:25 +0000
@@ -131,7 +131,7 @@
+ {
+ }
--void mga::GLContext::make_current()
++void mga::GLContext::make_current() const
+ {
      if (eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context) == EGL_FALSE)
+     {
@@ -140,7 +140,7 @@
+     }
+ }
--void mga::GLContext::release_current()
++void mga::GLContext::release_current() const
+ {
      eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ }
 === modified file 'src/platform/graphics/android/gl_context.h'
 --- src/platform/graphics/android/gl_context.h	2013-12-17 18:24:51 +0000
 +++ src/platform/graphics/android/gl_context.h	2013-12-19 09:13:25 +0000
@@ -48,9 +48,9 @@
      ~GLContext();
--    void make_current();
++    void make_current() const override;
      void swap_buffers();
--    void release_current();
++    void release_current() const override;
      /* TODO: (kdub) remove these two functions once HWC1.0 construction is sorted out. */
      EGLDisplay display()
 === modified file 'src/platform/graphics/mesa/display.cpp'
 --- src/platform/graphics/mesa/display.cpp	2013-12-17 18:24:51 +0000
 +++ src/platform/graphics/mesa/display.cpp	2013-12-19 09:13:25 +0000
@@ -58,12 +58,12 @@
          egl.setup(gbm, shared_context);
+     }
--    void make_current()
++    void make_current() const override
+     {
          egl.make_current();
+     }
--    void release_current()
++    void release_current() const override
+     {
          egl.release_current();
+     }
 === modified file 'src/platform/graphics/mesa/display_helpers.cpp'
 --- src/platform/graphics/mesa/display_helpers.cpp	2013-12-17 18:24:51 +0000
 +++ src/platform/graphics/mesa/display_helpers.cpp	2013-12-19 09:13:25 +0000
@@ -357,13 +357,13 @@
      return (ret == EGL_TRUE);
+ }
--bool mgmh::EGLHelper::make_current()
++bool mgmh::EGLHelper::make_current() const
+ {
      auto ret = eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
      return (ret == EGL_TRUE);
+ }
--bool mgmh::EGLHelper::release_current()
++bool mgmh::EGLHelper::release_current() const
+ {
      auto ret = eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
      return (ret == EGL_TRUE);
 === modified file 'src/platform/graphics/mesa/display_helpers.h'
 --- src/platform/graphics/mesa/display_helpers.h	2013-12-17 18:24:51 +0000
 +++ src/platform/graphics/mesa/display_helpers.h	2013-12-19 09:13:25 +0000
@@ -108,8 +108,8 @@
                 EGLContext shared_context);
      bool swap_buffers();
--    bool make_current();
--    bool release_current();
++    bool make_current() const;
++    bool release_current() const;
      EGLContext context() { return egl_context; }
 === modified file 'src/server/graphics/CMakeLists.txt'
 --- src/server/graphics/CMakeLists.txt	2013-12-17 18:24:51 +0000
 +++ src/server/graphics/CMakeLists.txt	2013-12-19 09:13:25 +0000
@@ -5,6 +5,8 @@
    default_configuration.cpp
    default_display_configuration_policy.cpp
++  gl_extensions_base.cpp
++  surfaceless_egl_context.cpp
+ )
  add_subdirectory(nested/)
 === renamed file 'src/server/graphics/offscreen/gl_extensions_base.cpp' => 'src/server/graphics/gl_extensions_base.cpp'
 --- src/server/graphics/offscreen/gl_extensions_base.cpp	2013-11-14 09:45:44 +0000
 +++ src/server/graphics/gl_extensions_base.cpp	2013-12-19 09:13:25 +0000
@@ -16,16 +16,16 @@
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
--#include "gl_extensions_base.h"
++#include "mir/graphics/gl_extensions_base.h"
  #include <boost/throw_exception.hpp>
  #include <stdexcept>
  #include <cstring>
--namespace mgo = mir::graphics::offscreen;
++namespace mg = mir::graphics;
--mgo::GLExtensionsBase::GLExtensionsBase(char const* extensions)
++mg::GLExtensionsBase::GLExtensionsBase(char const* extensions)
      : extensions{extensions}
+ {
      if (!extensions)
@@ -35,7 +35,7 @@
+     }
+ }
--bool mgo::GLExtensionsBase::support(char const* ext) const
++bool mg::GLExtensionsBase::support(char const* ext) const
+ {
      char const* ext_ptr = extensions;
      size_t const len = strlen(ext);
 === modified file 'src/server/graphics/nested/nested_display.cpp'
 --- src/server/graphics/nested/nested_display.cpp	2013-12-17 18:24:51 +0000
 +++ src/server/graphics/nested/nested_display.cpp	2013-12-19 09:13:25 +0000
@@ -23,6 +23,7 @@
  #include "mir/geometry/rectangle.h"
  #include "mir/graphics/gl_context.h"
++#include "mir/graphics/surfaceless_egl_context.h"
  #include "host_connection.h"
  #include <boost/throw_exception.hpp>
@@ -275,53 +276,11 @@
  namespace
+ {
--EGLint const dummy_pbuffer_attribs[] =
--{
--    EGL_WIDTH, 1,
--    EGL_HEIGHT, 1,
--    EGL_NONE
--};
+ }
  std::unique_ptr<mg::GLContext> mgn::NestedDisplay::create_gl_context()
+ {
--    class NestedGLContext : public mg::GLContext
--    {
--    public:
--        NestedGLContext(detail::EGLDisplayHandle const& egl_display) :
--            egl_display{egl_display},
--            egl_config{egl_display.choose_config(detail::nested_egl_config_attribs)},
--            egl_context{egl_display, eglCreateContext(egl_display, egl_config, EGL_NO_CONTEXT, detail::nested_egl_context_attribs)},
--            egl_surface{egl_display, eglCreatePbufferSurface(egl_display, egl_config, dummy_pbuffer_attribs)}
--        {
--        }
--
--        ~NestedGLContext() noexcept
--        {
--            if (eglGetCurrentContext() == egl_context)
--                release_current();
--        }
--
--        void make_current() override
--        {
--            if (eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context) == EGL_FALSE)
--            {
--                BOOST_THROW_EXCEPTION(
--                    std::runtime_error("could not activate dummy surface with eglMakeCurrent\n"));
--            }
--        }
--
--        void release_current() override
--        {
--            eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
--        }
--
--    private:
--        EGLDisplay const egl_display;
--        EGLConfig const egl_config;
--        EGLContextStore const egl_context;
--        EGLSurfaceStore const egl_surface;
--    };
--
--    return std::unique_ptr<mg::GLContext>{new NestedGLContext(egl_display)};
++    return std::unique_ptr<mg::GLContext>{new SurfacelessEGLContext(egl_display,
++                                                                    detail::nested_egl_config_attribs,
++                                                                    EGL_NO_CONTEXT)};
+ }
 === modified file 'src/server/graphics/offscreen/CMakeLists.txt'
 --- src/server/graphics/offscreen/CMakeLists.txt	2013-11-12 17:23:53 +0000
 +++ src/server/graphics/offscreen/CMakeLists.txt	2013-12-19 09:13:25 +0000
@@ -4,8 +4,6 @@
    display.cpp
    display_configuration.cpp
    display_buffer.cpp
--  surfaceless_egl_context.cpp
--  gl_extensions_base.cpp
+ )
  target_link_libraries(
 === modified file 'src/server/graphics/offscreen/display.cpp'
 --- src/server/graphics/offscreen/display.cpp	2013-11-18 12:35:14 +0000
 +++ src/server/graphics/offscreen/display.cpp	2013-12-19 09:13:25 +0000
@@ -20,7 +20,6 @@
  #include "display_buffer.h"
  #include "mir/graphics/basic_platform.h"
  #include "mir/graphics/display_configuration_policy.h"
--#include "mir/graphics/gl_context.h"
  #include "mir/geometry/size.h"
  #include <boost/throw_exception.hpp>
@@ -33,33 +32,6 @@
  namespace
+ {
--class OffscreenGLContext : public mg::GLContext
--{
--public:
--    OffscreenGLContext(mgo::SurfacelessEGLContext surfaceless_egl_context)
--        : surfaceless_egl_context{std::move(surfaceless_egl_context)}
--    {
--    }
--
--    ~OffscreenGLContext() noexcept
--    {
--        release_current();
--    }
--
--    void make_current()
--    {
--        surfaceless_egl_context.make_current();
--    }
--
--    void release_current()
--    {
--        surfaceless_egl_context.release_current();
--    }
--
--private:
--    mgo::SurfacelessEGLContext const surfaceless_egl_context;
--};
--
  mgo::detail::EGLDisplayHandle
  create_and_initialize_display(mg::BasicPlatform& basic_platform)
+ {
@@ -193,5 +165,5 @@
  std::unique_ptr<mg::GLContext> mgo::Display::create_gl_context()
+ {
      return std::unique_ptr<GLContext>{
--        new OffscreenGLContext{SurfacelessEGLContext{egl_display, egl_context_shared}}};
++        new SurfacelessEGLContext{egl_display, egl_context_shared}};
+ }
 === modified file 'src/server/graphics/offscreen/display.h'
 --- src/server/graphics/offscreen/display.h	2013-11-18 17:08:15 +0000
 +++ src/server/graphics/offscreen/display.h	2013-12-19 09:13:25 +0000
@@ -21,7 +21,7 @@
  #include "mir/graphics/display.h"
  #include "display_configuration.h"
--#include "surfaceless_egl_context.h"
++#include "mir/graphics/surfaceless_egl_context.h"
  #include <mutex>
  #include <vector>
 === modified file 'src/server/graphics/offscreen/display_buffer.cpp'
 --- src/server/graphics/offscreen/display_buffer.cpp	2013-12-17 18:24:51 +0000
 +++ src/server/graphics/offscreen/display_buffer.cpp	2013-12-19 09:13:25 +0000
@@ -17,7 +17,7 @@
   */
  #include "display_buffer.h"
--#include "gl_extensions_base.h"
++#include "mir/graphics/gl_extensions_base.h"
  #include "mir/raii.h"
  #include <boost/throw_exception.hpp>
@@ -33,11 +33,11 @@
  namespace
+ {
--class GLExtensions : public mgo::GLExtensionsBase
++class GLExtensions : public mg::GLExtensionsBase
+ {
  public:
      GLExtensions() :
--        mgo::GLExtensionsBase{
++        mg::GLExtensionsBase{
              reinterpret_cast<char const*>(glGetString(GL_EXTENSIONS))}
+     {
+     }
 === modified file 'src/server/graphics/offscreen/display_buffer.h'
 --- src/server/graphics/offscreen/display_buffer.h	2013-11-14 09:46:02 +0000
 +++ src/server/graphics/offscreen/display_buffer.h	2013-12-19 09:13:25 +0000
@@ -19,7 +19,7 @@
  #ifndef MIR_GRAPHICS_OFFSCREEN_DISPLAY_BUFFER_H_
  #define MIR_GRAPHICS_OFFSCREEN_DISPLAY_BUFFER_H_
--#include "surfaceless_egl_context.h"
++#include "mir/graphics/surfaceless_egl_context.h"
  #include "mir/graphics/display_buffer.h"
  #include "mir/geometry/size.h"
 === renamed file 'src/server/graphics/offscreen/surfaceless_egl_context.cpp' => 'src/server/graphics/surfaceless_egl_context.cpp'
 --- src/server/graphics/offscreen/surfaceless_egl_context.cpp	2013-11-18 12:58:38 +0000
 +++ src/server/graphics/surfaceless_egl_context.cpp	2013-12-19 09:13:25 +0000
@@ -16,22 +16,23 @@
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
--#include "surfaceless_egl_context.h"
--#include "gl_extensions_base.h"
++#include "mir/graphics/surfaceless_egl_context.h"
++#include "mir/graphics/gl_extensions_base.h"
  #include <boost/throw_exception.hpp>
  #include <stdexcept>
++#include <vector>
--namespace mgo = mir::graphics::offscreen;
++namespace mg = mir::graphics;
  namespace
+ {
--class EGLExtensions : public mgo::GLExtensionsBase
++class EGLExtensions : public mg::GLExtensionsBase
+ {
  public:
      EGLExtensions(EGLDisplay egl_display) :
--        mgo::GLExtensionsBase{
++        mg::GLExtensionsBase{
              reinterpret_cast<char const*>(eglQueryString(egl_display, EGL_EXTENSIONS))}
+     {
+     }
@@ -44,27 +45,62 @@
      return extensions.support("EGL_KHR_surfaceless_context");
+ }
--EGLConfig choose_config(EGLDisplay egl_display, bool surfaceless)
--{
--    EGLint const surface_type = surfaceless ? EGL_DONT_CARE : EGL_PBUFFER_BIT;
--
--    EGLint const config_attr[] = {
--        EGL_SURFACE_TYPE, surface_type,
--        EGL_RED_SIZE, 8,
--        EGL_GREEN_SIZE, 8,
--        EGL_BLUE_SIZE, 8,
--        EGL_ALPHA_SIZE, 0,
--        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
--        EGL_NONE
--    };
--
++std::vector<EGLint> ensure_pbuffer_set(EGLint const* attribs)
++{
++    bool has_preferred_surface = false;
++    std::vector<EGLint> attribs_with_surface_type;
++    int i = 0;
++
++    while (attribs[i] != EGL_NONE)
++    {
++        attribs_with_surface_type.push_back(attribs[i]);
++        if (attribs[i] == EGL_SURFACE_TYPE)
++        {
++            has_preferred_surface = true;
++            if (attribs[i+1] == EGL_DONT_CARE)
++            {
++                /* Need to treat EGL_DONT_CARE specially, as it is defined as all-bits-set */
++                attribs_with_surface_type.push_back(EGL_PBUFFER_BIT);
++            }
++            else
++            {
++                attribs_with_surface_type.push_back(attribs[i+1] | EGL_PBUFFER_BIT);
++            }
++        }
++        else
++        {
++            attribs_with_surface_type.push_back(attribs[i+1]);
++        }
++        i += 2;
++    }
++
++    if (!has_preferred_surface)
++    {
++        attribs_with_surface_type.push_back(EGL_SURFACE_TYPE);
++        attribs_with_surface_type.push_back(EGL_PBUFFER_BIT);
++    }
++
++    attribs_with_surface_type.push_back(EGL_NONE);
++
++    return attribs_with_surface_type;
++}
++
++EGLConfig choose_config(EGLDisplay egl_display, EGLint const* attribs, bool surfaceless)
++{
      EGLConfig egl_config{0};
      int num_egl_configs{0};
--
--    if (eglChooseConfig(egl_display, config_attr, &egl_config, 1, &num_egl_configs) == EGL_FALSE ||
++    std::vector<EGLint> validated_attribs;
++
++    if (!surfaceless)
++    {
++        validated_attribs = ensure_pbuffer_set(attribs);
++        attribs = validated_attribs.data();
++    }
++
++    if (eglChooseConfig(egl_display, attribs, &egl_config, 1, &num_egl_configs) == EGL_FALSE ||
          num_egl_configs != 1)
+     {
--        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to choose ARGB EGL config"));
++        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to choose EGL config"));
+     }
      return egl_config;
@@ -88,14 +124,32 @@
      EGL_NONE
  };
--}
--
--mgo::SurfacelessEGLContext::SurfacelessEGLContext(
--    EGLDisplay egl_display,
--    EGLContext shared_context)
++EGLint const default_attr[] =
++{
++    EGL_SURFACE_TYPE, EGL_DONT_CARE,
++    EGL_RED_SIZE, 8,
++    EGL_GREEN_SIZE, 8,
++    EGL_BLUE_SIZE, 8,
++    EGL_ALPHA_SIZE, 0,
++    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
++    EGL_NONE
++};
++
++
++}
++
++mg::SurfacelessEGLContext::SurfacelessEGLContext(EGLDisplay egl_display, EGLContext shared_context)
++    : SurfacelessEGLContext(egl_display, default_attr, shared_context)
++{
++}
++
++mg::SurfacelessEGLContext::SurfacelessEGLContext(
++        EGLDisplay egl_display,
++        EGLint const* attribs,
++        EGLContext shared_context)
      : egl_display{egl_display},
        surfaceless{supports_surfaceless_context(egl_display)},
--      egl_config{choose_config(egl_display, surfaceless)},
++      egl_config{choose_config(egl_display, attribs, surfaceless)},
        egl_surface{egl_display,
                    surfaceless ? EGL_NO_SURFACE : create_surface(egl_display, egl_config),
                    surfaceless ? EGLSurfaceStore::AllowNoSurface :
@@ -107,7 +161,24 @@
+ {
+ }
--void mgo::SurfacelessEGLContext::make_current() const
++
++mg::SurfacelessEGLContext::SurfacelessEGLContext(SurfacelessEGLContext&& move)
++    : egl_display(move.egl_display),
++      surfaceless(move.surfaceless),
++      egl_config(move.egl_config),
++      egl_surface{std::move(move.egl_surface)},
++      egl_context{std::move(move.egl_context)}
++{
++    move.egl_display = EGL_NO_DISPLAY;
++}
++
++mg::SurfacelessEGLContext::~SurfacelessEGLContext() noexcept
++{
++    release_current();
++}
++
++
++void mg::SurfacelessEGLContext::make_current() const
+ {
      if (eglGetCurrentContext() == egl_context)
          return;
@@ -120,13 +191,13 @@
+     }
+ }
--void mgo::SurfacelessEGLContext::release_current() const
++void mg::SurfacelessEGLContext::release_current() const
+ {
--    if (eglGetCurrentContext() == egl_context)
++    if (egl_context != EGL_NO_CONTEXT && eglGetCurrentContext() == egl_context)
          eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ }
--mgo::SurfacelessEGLContext::operator EGLContext() const
++mg::SurfacelessEGLContext::operator EGLContext() const
+ {
      return egl_context;
+ }
 === modified file 'tests/unit-tests/graphics/CMakeLists.txt'
 --- tests/unit-tests/graphics/CMakeLists.txt	2013-12-17 18:24:51 +0000
 +++ tests/unit-tests/graphics/CMakeLists.txt	2013-12-19 09:13:25 +0000
@@ -6,6 +6,7 @@
      ${CMAKE_CURRENT_SOURCE_DIR}/test_default_display_configuration_policy.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_id.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_properties.cpp
++    ${CMAKE_CURRENT_SOURCE_DIR}/test_surfaceless_egl_context.cpp
+ )
  add_subdirectory(nested/)
 === added file 'tests/unit-tests/graphics/test_surfaceless_egl_context.cpp'
 --- tests/unit-tests/graphics/test_surfaceless_egl_context.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit-tests/graphics/test_surfaceless_egl_context.cpp	2013-12-19 09:13:25 +0000
@@ -0,0 +1,254 @@
++/*
++ * Copyright © 2013 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by:
++ *   Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
++ */
++
++#include "mir/graphics/surfaceless_egl_context.h"
++#include "mir_test_doubles/mock_egl.h"
++#include <stdexcept>
++#include <list>
++
++#include <gtest/gtest.h>
++#include <gmock/gmock.h>
++
++namespace mg = mir::graphics;
++namespace mtd = mir::test::doubles;
++
++class SurfacelessEGLContextTest  : public ::testing::Test
++{
++public:
++    EGLDisplay const fake_display{reinterpret_cast<EGLDisplay>(0xfffaaafa)};
++    EGLSurface const fake_surface{reinterpret_cast<EGLSurface>(0xdeadbeef)};
++    EGLContext const fake_context{reinterpret_cast<EGLContext>(0xfaafbaaf)};
++
++protected:
++    virtual void SetUp()
++    {
++        using namespace testing;
++
++        ON_CALL(mock_egl, eglCreatePbufferSurface(_,_,_))
++            .WillByDefault(Return(fake_surface));
++        ON_CALL(mock_egl, eglCreateContext(_,_,_,_))
++            .WillByDefault(Return(fake_context));
++        ON_CALL(mock_egl, eglGetCurrentContext())
++             .WillByDefault(Return(EGL_NO_CONTEXT));
++    }
++
++    testing::NiceMock<mtd::MockEGL> mock_egl;
++};
++
++namespace
++{
++
++MATCHER(ConfigAttribContainsPBufferFlag, "")
++{
++    EGLint surface_type = 0;
++    bool found_surface_type = false;
++    std::list<std::string> pretty_surface;
++
++    for (int i = 0; arg[i] != EGL_NONE; ++i)
++    {
++        if (arg[i] == EGL_SURFACE_TYPE)
++        {
++            surface_type = arg[i+1];
++            found_surface_type = true;
++        }
++    }
++
++    if (found_surface_type)
++    {
++        if (surface_type == EGL_DONT_CARE)
++        {
++            pretty_surface.push_back("EGL_DONT_CARE");
++        }
++        else
++        {
++            if (surface_type & EGL_MULTISAMPLE_RESOLVE_BOX_BIT)
++            {
++                pretty_surface.push_back("EGL_MULTISAMPLE_RESOLVE_BOX_BIT");
++            }
++            if (surface_type & EGL_PBUFFER_BIT)
++            {
++                pretty_surface.push_back("EGL_PBUFFER_BIT");
++            }
++            if (surface_type & EGL_PIXMAP_BIT)
++            {
++                pretty_surface.push_back("EGL_PIXMAP_BIT");
++            }
++            if (surface_type & EGL_SWAP_BEHAVIOR_PRESERVED_BIT)
++            {
++                pretty_surface.push_back("EGL_SWAP_BEHAVIOR_PRESERVED_BIT");
++            }
++            if (surface_type & EGL_VG_ALPHA_FORMAT_PRE_BIT)
++            {
++                pretty_surface.push_back("EGL_VG_ALPHA_FORMAT_PRE_BIT");
++            }
++            if (surface_type & EGL_VG_COLORSPACE_LINEAR_BIT)
++            {
++                pretty_surface.push_back("EGL_VG_COLORSPACE_LINEAR_BIT");
++            }
++            if (surface_type & EGL_WINDOW_BIT)
++            {
++                pretty_surface.push_back("EGL_WINDOW_BIT");
++            }
++        }
++        std::string pretty_result = pretty_surface.back();
++        pretty_surface.pop_back();
++        for (auto& pretty : pretty_surface)
++        {
++            pretty_result += " | " + pretty;
++        }
++        *result_listener << "surface type is "<< pretty_result;
++    }
++    else
++    {
++        *result_listener << "no surface type set";
++    }
++
++    return found_surface_type &&
++           (surface_type != EGL_DONT_CARE) &&
++           (surface_type & EGL_PBUFFER_BIT);
++}
++
++}
++
++TEST_F(SurfacelessEGLContextTest, UsesPBufferContainingAttribsListByDefault)
++{
++    using namespace testing;
++
++    ON_CALL(mock_egl, eglQueryString(_,_))
++        .WillByDefault(Return(""));
++
++    EXPECT_CALL(mock_egl, eglChooseConfig(_, ConfigAttribContainsPBufferFlag(), _,_,_))
++        .WillOnce(DoAll(SetArgPointee<4>(1), Return(EGL_TRUE)));
++
++    mg::SurfacelessEGLContext ctx_noattrib(fake_display, EGL_NO_CONTEXT);
++}
++
++TEST_F(SurfacelessEGLContextTest, KeepsPBufferInAttribsList)
++{
++    using namespace testing;
++
++    const EGLint attribs_with_pbuffer[] =
++    {
++        EGL_SURFACE_TYPE, EGL_PBUFFER_BIT | EGL_WINDOW_BIT,
++        EGL_NONE
++    };
++
++    ON_CALL(mock_egl, eglQueryString(_,_))
++        .WillByDefault(Return(""));
++
++    EXPECT_CALL(mock_egl, eglChooseConfig(_, ConfigAttribContainsPBufferFlag(), _,_,_))
++        .WillOnce(DoAll(SetArgPointee<4>(1), Return(EGL_TRUE)));
++
++    mg::SurfacelessEGLContext ctx_attribs_with_pbuffer(fake_display, attribs_with_pbuffer, EGL_NO_CONTEXT);
++}
++
++TEST_F(SurfacelessEGLContextTest, AddsPBufferToAttribList)
++{
++    using namespace testing;
++
++    const EGLint attribs_without_surface_type[] =
++    {
++        EGL_ALPHA_SIZE, 8,
++        EGL_CLIENT_APIS, EGL_OPENGL_ES2_BIT,
++        EGL_NONE
++    };
++
++    ON_CALL(mock_egl, eglQueryString(_,_))
++        .WillByDefault(Return(""));
++
++    EXPECT_CALL(mock_egl, eglChooseConfig(_, ConfigAttribContainsPBufferFlag(), _,_,_))
++        .WillOnce(DoAll(SetArgPointee<4>(1), Return(EGL_TRUE)));
++
++    mg::SurfacelessEGLContext ctx_attribs_without_surface_type(fake_display, attribs_without_surface_type, EGL_NO_CONTEXT);
++}
++
++TEST_F(SurfacelessEGLContextTest, AddsPBufferWhenNonPBufferSurfaceTypeRequested)
++{
++    using namespace testing;
++
++    const EGLint attribs_without_pbuffer[] =
++    {
++        EGL_SURFACE_TYPE, EGL_DONT_CARE,
++        EGL_ALPHA_SIZE, 8,
++        EGL_CLIENT_APIS, EGL_OPENGL_ES2_BIT,
++        EGL_NONE
++    };
++
++    ON_CALL(mock_egl, eglQueryString(_,_))
++        .WillByDefault(Return(""));
++
++    EXPECT_CALL(mock_egl, eglChooseConfig(_, ConfigAttribContainsPBufferFlag(), _,_,_))
++        .WillOnce(DoAll(SetArgPointee<4>(1), Return(EGL_TRUE)));
++
++    mg::SurfacelessEGLContext ctx_attribs_without_pbuffer(fake_display, attribs_without_pbuffer, EGL_NO_CONTEXT);
++}
++
++TEST_F(SurfacelessEGLContextTest, DoesNotRequestPBufferWithNoAttrib)
++{
++    using namespace testing;
++
++    ON_CALL(mock_egl, eglQueryString(_,_))
++        .WillByDefault(Return("EGL_KHR_surfaceless_context"));
++
++    EXPECT_CALL(mock_egl, eglChooseConfig(_, Not(ConfigAttribContainsPBufferFlag()), _,_,_))
++        .WillOnce(DoAll(SetArgPointee<4>(1), Return(EGL_TRUE)));
++
++    mg::SurfacelessEGLContext ctx_noattrib(fake_display, EGL_NO_CONTEXT);
++}
++
++TEST_F(SurfacelessEGLContextTest, DoesNotAddPBufferToAttribList)
++{
++    using namespace testing;
++
++    const EGLint attribs_without_surface_type[] =
++    {
++        EGL_ALPHA_SIZE, 8,
++        EGL_CLIENT_APIS, EGL_OPENGL_ES2_BIT,
++        EGL_NONE
++    };
++
++    ON_CALL(mock_egl, eglQueryString(_,_))
++        .WillByDefault(Return("EGL_KHR_surfaceless_context"));
++
++    EXPECT_CALL(mock_egl, eglChooseConfig(_, Not(ConfigAttribContainsPBufferFlag()), _,_,_))
++        .WillOnce(DoAll(SetArgPointee<4>(1), Return(EGL_TRUE)));
++
++    mg::SurfacelessEGLContext ctx_attribs_without_surface_type(fake_display, attribs_without_surface_type, EGL_NO_CONTEXT);
++}
++
++TEST_F(SurfacelessEGLContextTest, DoesNotAddPBufferToSurfaceTypeRequest)
++{
++    using namespace testing;
++
++    const EGLint attribs_with_surface_type[] =
++    {
++        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
++        EGL_ALPHA_SIZE, 8,
++        EGL_CLIENT_APIS, EGL_OPENGL_ES2_BIT,
++        EGL_NONE
++    };
++
++    ON_CALL(mock_egl, eglQueryString(_,_))
++        .WillByDefault(Return("EGL_KHR_surfaceless_context"));
++
++    EXPECT_CALL(mock_egl, eglChooseConfig(_, Not(ConfigAttribContainsPBufferFlag()), _,_,_))
++        .WillOnce(DoAll(SetArgPointee<4>(1), Return(EGL_TRUE)));
++
++    mg::SurfacelessEGLContext ctx_attribs_with_surface_type(fake_display, attribs_with_surface_type, EGL_NO_CONTEXT);
++}
 === modified file 'tests/unit-tests/scene/test_gl_pixel_buffer.cpp'
 --- tests/unit-tests/scene/test_gl_pixel_buffer.cpp	2013-12-17 18:24:51 +0000
 +++ tests/unit-tests/scene/test_gl_pixel_buffer.cpp	2013-12-19 09:13:25 +0000
@@ -38,8 +38,8 @@
  struct MockGLContext : public mg::GLContext
+ {
      ~MockGLContext() noexcept {}
--    MOCK_METHOD0(make_current, void());
--    MOCK_METHOD0(release_current, void());
++    MOCK_CONST_METHOD0(make_current, void());
++    MOCK_CONST_METHOD0(release_current, void());
  };
  struct WrappingGLContext : public mg::GLContext
@@ -49,8 +49,8 @@
+     {
+     }
      ~WrappingGLContext() noexcept {}
--    void make_current() { wrapped.make_current(); }
--    void release_current() { wrapped.release_current(); }
++    void make_current() const { wrapped.make_current(); }
++    void release_current() const { wrapped.release_current(); }
      mg::GLContext& wrapped;
  };