Merge lp:~vanvugt/mir/full-gl into lp:mir

[Daniel van Vugt]

Introducing full desktop GL support for Mir servers (LP: #1420581)

It works well with Mesa, but is disabled by default due to one
remaining "TODO" you will find.

Note the new eglBindAPI calls. Without those, EGL makes all new
threads default to ES. And then eglMakeContext/eglGetCurrent*
functions will randomly fail. So we need to be sure any thread
that touches EGL will call eglBindAPI with the correct value
first.

[Daniel van Vugt (vanvugt)]

Hmm that TODO may not be required. Seems GL_OES_EGL_image is a standard feature provided by Mesa even in non-ES full OpenGL. And with some Googling, AMD even seems to claim they support it in full OpenGL too. That only leaves a question mark over NVIDIA...

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3528
https://mir-jenkins.ubuntu.com/job/mir-ci/983/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1065
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1112
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1103
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1103
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1075
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1075/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1075
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1075/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1075
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1075/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1075
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1075/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1075
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1075/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/983/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

* Needs discussion *

I am not quite sure about this. The right way to achieve GL-based compositing should not be this invasive. In my mind, it should go more or less like the following :

1- Finish the work that alf started abstracting the renderer. There should not be any renderer specific code outside the renderer (e.g. no EGL/GL/GLES calls).

2- This should give us a proper (default) renderer with GLESv2. Going one step further, since GL/GLES would probably be desired by many shells potentially, we should have multiple flavors of a default set of renderers already implemented in Mir (e.g. A GL based renderer, a GLESv2 renderer, a GLESv3 renderer).

3- The shells should also be able to override that functionality with their own renderer (say vulkan based), or blitter based renderer). (I believe we already have some form of this but not sure how complete).

4- Also the renderer should be able to be chosen at run-time dynamically and replaced on the fly if needed, though this can be done at a later time (e.g. use blitter based rendering instead of GL for power reasons etc).

review: Needs Information

[Daniel van Vugt (vanvugt)]

As discussed in the hangout today, I agree and I think we all agree that dynamic renderer selection is where we want to be in future.

However this work is a necessary stepping stone on that path. You can't make progress toward dynamic renderer selection without this work.

[Cemil Azizoglu (cemil-azizoglu)]

Isolating renderers and dynamically selecting them is a long term goal. Given that Qtmir needs GL today, it is more correct to support GL rather than GLES.

So lgtm.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-03 04:36:33 +0000
+++ CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -199,6 +199,40 @@
 include_directories (SYSTEM ${EGL_INCLUDE_DIRS})
 include_directories (SYSTEM ${GLM_INCLUDE_DIRS})
 
+#
+# Full OpenGL support works with Mesa. Although it probably should not, and
+# is expected to fail in proprietary drivers due to one remaining "TODO" in:
+#   src/platform/graphics/egl_extensions.cpp
+#
+#if (TARGET_ARCH STREQUAL "x86_64-linux-gnu" OR
+#    TARGET_ARCH STREQUAL "i386-linux-gnu")
+#  set(DEFAULT_LIBGL "libGL")
+#else()
+  set(DEFAULT_LIBGL "libGLESv2")
+#endif()
+set(MIR_SERVER_LIBGL ${DEFAULT_LIBGL} CACHE STRING "OpenGL library to use in Mir servers {libGL,libGLESv2}")
+
+if (MIR_SERVER_LIBGL STREQUAL "libGL")
+  pkg_check_modules(GL REQUIRED gl)
+  add_definitions(
+    -DGL_GLEXT_PROTOTYPES
+    -DMIR_SERVER_GL_H=<GL/gl.h>
+    -DMIR_SERVER_GLEXT_H=<GL/glext.h>
+    -DMIR_SERVER_EGL_OPENGL_BIT=EGL_OPENGL_BIT
+    -DMIR_SERVER_EGL_OPENGL_API=EGL_OPENGL_API
+  )
+elseif (MIR_SERVER_LIBGL STREQUAL "libGLESv2")
+  pkg_check_modules(GL REQUIRED glesv2)
+  add_definitions(
+    -DMIR_SERVER_GL_H=<GLES2/gl2.h>
+    -DMIR_SERVER_GLEXT_H=<GLES2/gl2ext.h>
+    -DMIR_SERVER_EGL_OPENGL_BIT=EGL_OPENGL_ES2_BIT
+    -DMIR_SERVER_EGL_OPENGL_API=EGL_OPENGL_ES_API
+  )
+else()
+  message(FATAL_ERROR "Invalid MIR_SERVER_LIBGL value ${MIR_SERVER_LIBGL}")
+endif()
+
 if (MIR_BUILD_PLATFORM_ANDROID)
   find_package(AndroidProperties REQUIRED)
   find_package(LibHardware REQUIRED)
 
=== modified file 'debian/control'
--- debian/control	2016-05-03 04:36:33 +0000
+++ debian/control	2016-05-13 09:11:33 +0000
@@ -19,6 +19,7 @@
                libdrm-dev,
                libegl1-mesa-dev,
                libgles2-mesa-dev,
+               libgl1-mesa-dev [amd64 i386],
                libgbm-dev,
                libglm-dev,
                libprotobuf-dev,
 
=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2016-05-09 14:27:58 +0000
+++ examples/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -167,20 +167,20 @@
 target_link_libraries(mir_demo_client_scroll
   eglapp
   mirdraw
+  ${GLESv2_LIBRARIES}
 )
 
 mir_add_wrapped_executable(mir_demo_client_prompt_session prompt_session.c)
 target_link_libraries(mir_demo_client_prompt_session mirclient)
 
 add_library(mirdraw STATIC graphics_utils.cpp)
-target_link_libraries(mirdraw ${GLESv2_LIBRARIES})
 
 include_directories(
   ${PROJECT_SOURCE_DIR}/include/server
   ${PROJECT_SOURCE_DIR}/include/client
   ${PROJECT_SOURCE_DIR}/include/platform
   ${PROJECT_SOURCE_DIR}/include/renderers/gl
-  ${GLESv2_INCLUDE_DIRS}
+  ${GL_INCLUDE_DIRS}
 )
 
 mir_add_wrapped_executable(mir_demo_standalone_render_to_fb
@@ -190,6 +190,7 @@
 target_link_libraries(mir_demo_standalone_render_to_fb
     mirserver
     mirdraw
+    ${GL_LIBRARIES}
     ${Boost_LIBRARIES}
 )
 
 
=== modified file 'examples/graphics_utils.cpp'
--- examples/graphics_utils.cpp	2013-04-24 05:22:20 +0000
+++ examples/graphics_utils.cpp	2016-05-13 09:11:33 +0000
@@ -38,7 +38,9 @@
 
 static const GLchar *frag_shader_src =
 {
+    "#ifdef GL_ES\n"
     "precision mediump float;\n"
+    "#endif\n"
     "uniform sampler2D tex;\n"
     "varying vec2 texcoord;\n"
     "void main() {\n"
 
=== modified file 'examples/image_renderer.cpp'
--- examples/image_renderer.cpp	2015-07-16 07:03:19 +0000
+++ examples/image_renderer.cpp	2016-05-13 09:11:33 +0000
@@ -49,7 +49,9 @@
 
 const GLchar* fragment_shader_src =
 {
+    "#ifdef GL_ES\n"
     "precision mediump float;\n"
+    "#endif\n"
     "uniform sampler2D tex;\n"
     "varying vec2 v_texcoord;\n"
     "void main() {\n"
 
=== modified file 'examples/server_example_adorning_compositor.cpp'
--- examples/server_example_adorning_compositor.cpp	2016-03-29 07:30:50 +0000
+++ examples/server_example_adorning_compositor.cpp	2016-05-13 09:11:33 +0000
@@ -29,7 +29,7 @@
 #include <stdexcept>
 #include <boost/throw_exception.hpp>
 
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
 
 namespace me = mir::examples;
 namespace mg = mir::graphics;
@@ -85,7 +85,9 @@
         "}"
     },
     frag_shader_src{
-        "precision mediump float;"
+        "#ifdef GL_ES\n"
+        "precision mediump float;\n"
+        "#endif\n"
         "varying vec2 texcoord;"
         "uniform sampler2D tex;"
         "uniform float alpha;"
 
=== modified file 'include/test/mir/test/doubles/mock_egl.h'
--- include/test/mir/test/doubles/mock_egl.h	2016-01-29 08:18:22 +0000
+++ include/test/mir/test/doubles/mock_egl.h	2016-05-13 09:11:33 +0000
@@ -25,7 +25,9 @@
 #include <thread>
 #include <unordered_map>
 
+#ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
+#endif
 #define EGL_EGLEXT_PROTOTYPES
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
=== modified file 'playground/demo-shell/demo_renderer.cpp'
--- playground/demo-shell/demo_renderer.cpp	2016-01-29 08:18:22 +0000
+++ playground/demo-shell/demo_renderer.cpp	2016-05-13 09:11:33 +0000
@@ -152,7 +152,9 @@
 
 static const GLchar inverse_fshader[] =
 {
+    "#ifdef GL_ES\n"
     "precision mediump float;\n"
+    "#endif\n"
     "uniform sampler2D tex;\n"
     "uniform float alpha;\n"
     "varying vec2 v_texcoord;\n"
@@ -164,7 +166,9 @@
 };
 static const GLchar contrast_fshader[] =
 {
+    "#ifdef GL_ES\n"
     "precision mediump float;\n"
+    "#endif\n"
     "uniform sampler2D tex;\n"
     "uniform float alpha;\n"
     "varying vec2 v_texcoord;\n"
 
=== modified file 'playground/demo-shell/typo/CMakeLists.txt'
--- playground/demo-shell/typo/CMakeLists.txt	2015-02-19 09:30:02 +0000
+++ playground/demo-shell/typo/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -1,4 +1,3 @@
-find_package(GLESv2 REQUIRED)
 find_package(PkgConfig)
 
 pkg_search_module(FREETYPE freetype2)
@@ -13,8 +12,7 @@
   ${OPTIONAL_SRCS}
 )
 
-target_link_libraries(typo ${GLESv2_LIBRARIES})
-include_directories(${GLESv2_INCLUDE_DIRS})
+target_link_libraries(typo ${GL_LIBRARIES})
 target_include_directories(typo PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (FREETYPE_FOUND)
 
=== modified file 'playground/demo-shell/typo/typo_glcache.cpp'
--- playground/demo-shell/typo/typo_glcache.cpp	2015-07-16 07:03:19 +0000
+++ playground/demo-shell/typo/typo_glcache.cpp	2016-05-13 09:11:33 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "typo_glcache.h"
-#include <GLES2/gl2.h>  // TODO: Support plain OpenGL too
+#include MIR_SERVER_GL_H
 
 using namespace mir::examples::typo;
 
 
=== modified file 'src/gl/program.cpp'
--- src/gl/program.cpp	2016-01-29 08:18:22 +0000
+++ src/gl/program.cpp	2016-05-13 09:11:33 +0000
@@ -19,6 +19,8 @@
 #include "mir/gl/program.h"
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
+#include MIR_SERVER_GL_H
+#include MIR_SERVER_GLEXT_H
 
 namespace mgl = mir::gl;
 
 
=== modified file 'src/include/gl/mir/gl/primitive.h'
--- src/include/gl/mir/gl/primitive.h	2016-01-29 08:18:22 +0000
+++ src/include/gl/mir/gl/primitive.h	2016-05-13 09:11:33 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_GL_PRIMITIVE_H_
 #define MIR_GL_PRIMITIVE_H_
 
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
 
 namespace mir
 {
 
=== modified file 'src/include/gl/mir/gl/program.h'
--- src/include/gl/mir/gl/program.h	2015-10-05 08:19:39 +0000
+++ src/include/gl/mir/gl/program.h	2016-05-13 09:11:33 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_GL_PROGRAM_H_
 #define MIR_GL_PROGRAM_H_
 
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
 
 namespace mir
 {
 
=== modified file 'src/include/gl/mir/gl/texture.h'
--- src/include/gl/mir/gl/texture.h	2016-01-29 08:18:22 +0000
+++ src/include/gl/mir/gl/texture.h	2016-05-13 09:11:33 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_GL_TEXTURE_H_
 #define MIR_GL_TEXTURE_H_
 
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
 
 namespace mir
 {
 
=== modified file 'src/include/platform/mir/graphics/egl_extensions.h'
--- src/include/platform/mir/graphics/egl_extensions.h	2016-03-29 07:30:50 +0000
+++ src/include/platform/mir/graphics/egl_extensions.h	2016-05-13 09:11:33 +0000
@@ -19,12 +19,11 @@
 #ifndef MIR_GRAPHICS_EGL_EXTENSIONS_H_
 #define MIR_GRAPHICS_EGL_EXTENSIONS_H_
 
-#define GL_GLEXT_PROTOTYPES
 #define EGL_EGLEXT_PROTOTYPES
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
+#include MIR_SERVER_GL_H
+#include MIR_SERVER_GLEXT_H
 
 namespace mir
 {
 
=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2016-05-04 05:48:28 +0000
+++ src/platform/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -18,7 +18,7 @@
 
 set(MIR_PLATFORM_REFERENCES
   ${EGL_LDFLAGS} ${EGL_LIBRARIES}
-  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
+  ${GL_LDFLAGS} ${GL_LIBRARIES}
 )
 
 add_subdirectory(graphics/)
 
=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt	2016-03-29 07:30:50 +0000
+++ src/platform/graphics/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -1,4 +1,4 @@
-include_directories(${GLESv2_INCLUDE_DIRS})
+include_directories(${GL_INCLUDE_DIRS})
 
 set(
   GRAPHICS_SOURCES
 
=== modified file 'src/platform/graphics/egl_extensions.cpp'
--- src/platform/graphics/egl_extensions.cpp	2016-03-29 07:30:50 +0000
+++ src/platform/graphics/egl_extensions.cpp	2016-05-13 09:11:33 +0000
@@ -28,6 +28,13 @@
         reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(eglGetProcAddress("eglCreateImageKHR"))},
     eglDestroyImageKHR{
         reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(eglGetProcAddress("eglDestroyImageKHR"))},
+
+    /*
+     * TODO: Find a non-ES GL equivalent for glEGLImageTargetTexture2DOES
+     * It's the LAST remaining ES-specific function. Although Mesa lets you use
+     * it in full GL, it theoretically should not work. Mesa just lets you
+     * mix ES and GL code. But other drivers won't be so lenient.
+     */
     glEGLImageTargetTexture2DOES{
         reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"))}
 {
 
=== modified file 'src/platforms/android/include/egl_sync_extensions.h'
--- src/platforms/android/include/egl_sync_extensions.h	2016-01-29 13:10:01 +0000
+++ src/platforms/android/include/egl_sync_extensions.h	2016-05-13 09:11:33 +0000
@@ -19,7 +19,9 @@
 #ifndef MIR_GRAPHICS_EGL_SYNC_EXTENSIONS_H_
 #define MIR_GRAPHICS_EGL_SYNC_EXTENSIONS_H_
 
+#ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
+#endif
 #define EGL_EGLEXT_PROTOTYPES
 
 //Xenial egl has started needing a header (android/native_window.h)
 
=== modified file 'src/platforms/android/server/buffer.h'
--- src/platforms/android/server/buffer.h	2016-03-29 07:30:50 +0000
+++ src/platforms/android/server/buffer.h	2016-05-13 09:11:33 +0000
@@ -29,7 +29,9 @@
 #include <condition_variable>
 #include <map>
 
+#ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
+#endif
 #define EGL_EGLEXT_PROTOTYPES
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
=== modified file 'src/platforms/android/server/hwc_fallback_gl_renderer.cpp'
--- src/platforms/android/server/hwc_fallback_gl_renderer.cpp	2016-01-29 08:18:22 +0000
+++ src/platforms/android/server/hwc_fallback_gl_renderer.cpp	2016-05-13 09:11:33 +0000
@@ -30,6 +30,8 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
+#include <GLES2/gl2.h>
+
 namespace mg = mir::graphics;
 namespace mgl = mir::gl;
 namespace mga = mir::graphics::android;
 
=== modified file 'src/platforms/common/server/CMakeLists.txt'
--- src/platforms/common/server/CMakeLists.txt	2016-04-21 07:01:58 +0000
+++ src/platforms/common/server/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -1,6 +1,6 @@
 include_directories(
   ${server_common_include_dirs}
-  ${GLESv2_INCLUDE_DIRS}
+  ${GL_INCLUDE_DIRS}
 )
 
 add_library(server_platform_common STATIC
@@ -13,5 +13,5 @@
   server_platform_common
 
   ${Boost_SYSTEM_LIBRARY}
-  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
+  ${GL_LDFLAGS} ${GL_LIBRARIES}
 )
 
=== modified file 'src/platforms/common/server/shm_buffer.cpp'
--- src/platforms/common/server/shm_buffer.cpp	2016-05-03 04:36:33 +0000
+++ src/platforms/common/server/shm_buffer.cpp	2016-05-13 09:11:33 +0000
@@ -20,8 +20,8 @@
 #include "shm_file.h"
 #include "shm_buffer.h"
 #include "buffer_texture_binder.h"
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
+#include MIR_SERVER_GL_H
+#include MIR_SERVER_GLEXT_H
 
 #include <boost/throw_exception.hpp>
 
@@ -138,7 +138,9 @@
          */
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
-        glTexImage2D(GL_TEXTURE_2D, 0, format,
+        auto internal_format = (format == GL_BGRA_EXT) ? GL_RGBA : format;
+
+        glTexImage2D(GL_TEXTURE_2D, 0, internal_format,
                      size_.width.as_int(), size_.height.as_int(),
                      0, format, type, pixels);
     }
 
=== modified file 'src/platforms/mesa/server/buffer_allocator.cpp'
--- src/platforms/mesa/server/buffer_allocator.cpp	2016-05-04 09:06:26 +0000
+++ src/platforms/mesa/server/buffer_allocator.cpp	2016-05-13 09:11:33 +0000
@@ -31,8 +31,8 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
+#include MIR_SERVER_GL_H
+#include MIR_SERVER_GLEXT_H
 
 #include <algorithm>
 #include <stdexcept>
@@ -97,6 +97,7 @@
     {
         if (egl_image == EGL_NO_IMAGE_KHR)
         {
+            eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
             egl_display = eglGetCurrentDisplay();
             gbm_bo* bo_raw{bo.get()};
 
@@ -131,6 +132,7 @@
     {
         if (egl_image == EGL_NO_IMAGE_KHR)
         {
+            eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
             egl_display = eglGetCurrentDisplay();
             gbm_bo* bo_raw{bo.get()};
 
 
=== modified file 'src/platforms/mesa/server/display_helpers.cpp'
--- src/platforms/mesa/server/display_helpers.cpp	2016-05-04 09:06:26 +0000
+++ src/platforms/mesa/server/display_helpers.cpp	2016-05-13 09:11:33 +0000
@@ -321,8 +321,12 @@
 
 void mgmh::EGLHelper::setup(GBMHelper const& gbm)
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+
     static const EGLint context_attr[] = {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
         EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
         EGL_NONE
     };
 
@@ -335,8 +339,12 @@
 
 void mgmh::EGLHelper::setup(GBMHelper const& gbm, EGLContext shared_context)
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+
     static const EGLint context_attr[] = {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
         EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
         EGL_NONE
     };
 
@@ -350,8 +358,12 @@
 void mgmh::EGLHelper::setup(GBMHelper const& gbm, gbm_surface* surface_gbm,
                             EGLContext shared_context)
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+
     static const EGLint context_attr[] = {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
         EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
         EGL_NONE
     };
 
@@ -371,6 +383,7 @@
     if (egl_display != EGL_NO_DISPLAY) {
         if (egl_context != EGL_NO_CONTEXT)
         {
+            eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
             if (eglGetCurrentContext() == egl_context)
                 eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
             eglDestroyContext(egl_display, egl_context);
@@ -391,6 +404,7 @@
 bool mgmh::EGLHelper::make_current() const
 {
     auto ret = eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
     return (ret == EGL_TRUE);
 }
 
@@ -410,7 +424,7 @@
         EGL_ALPHA_SIZE, 0,
         EGL_DEPTH_SIZE, depth_buffer_bits,
         EGL_STENCIL_SIZE, stencil_buffer_bits,
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
         EGL_NONE
     };
 
@@ -440,8 +454,6 @@
         should_terminate_egl = true;
     }
 
-    eglBindAPI(EGL_OPENGL_ES_API);
-
     if (eglChooseConfig(egl_display, config_attr, &egl_config, 1, &num_egl_configs) == EGL_FALSE ||
         num_egl_configs != 1)
     {
 
=== modified file 'src/platforms/mesa/server/kms/CMakeLists.txt'
--- src/platforms/mesa/server/kms/CMakeLists.txt	2016-05-09 10:03:10 +0000
+++ src/platforms/mesa/server/kms/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -7,7 +7,7 @@
     ${DRM_INCLUDE_DIRS}
     ${GBM_INCLUDE_DIRS}
     ${EGL_INCLUDE_DIRS}
-    ${GLESv2_INCLUDE_DIRS}
+    ${GL_INCLUDE_DIRS}
     ${UDEV_INCLUDE_DIRS}
 )
 
@@ -59,7 +59,7 @@
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
   ${GBM_LDFLAGS} ${GBM_LIBRARIES}
   ${EGL_LDFLAGS} ${EGL_LIBRARIES}
-  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
+  ${GL_LDFLAGS} ${GL_LIBRARIES}
 )
 
 set_target_properties(
 
=== modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
--- src/platforms/mesa/server/kms/display_buffer.cpp	2016-05-03 04:36:33 +0000
+++ src/platforms/mesa/server/kms/display_buffer.cpp	2016-05-13 09:11:33 +0000
@@ -24,7 +24,7 @@
 #include "mir/fatal.h"
 
 #include <boost/throw_exception.hpp>
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
 
 #include <stdexcept>
 #include <chrono>
 
=== modified file 'src/platforms/mesa/server/x11/CMakeLists.txt'
--- src/platforms/mesa/server/x11/CMakeLists.txt	2016-01-29 08:18:22 +0000
+++ src/platforms/mesa/server/x11/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -26,7 +26,7 @@
   PRIVATE
   mirplatform
   EGL
-  GLESv2
+  ${GL_LDFLAGS} ${GL_LIBRARIES}
   X11
   mirsharedmesaservercommon-static
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
 
=== modified file 'src/platforms/mesa/server/x11/graphics/CMakeLists.txt'
--- src/platforms/mesa/server/x11/graphics/CMakeLists.txt	2016-05-04 09:06:26 +0000
+++ src/platforms/mesa/server/x11/graphics/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -9,7 +9,7 @@
     ${DRM_INCLUDE_DIRS}
     ${GBM_INCLUDE_DIRS}
     ${EGL_INCLUDE_DIRS}
-    ${GLESv2_INCLUDE_DIRS}
+    ${GL_INCLUDE_DIRS}
     ${UDEV_INCLUDE_DIRS}
 )
 
 
=== modified file 'src/platforms/mesa/server/x11/graphics/display.cpp'
--- src/platforms/mesa/server/x11/graphics/display.cpp	2016-04-28 13:23:32 +0000
+++ src/platforms/mesa/server/x11/graphics/display.cpp	2016-05-13 09:11:33 +0000
@@ -71,7 +71,7 @@
         EGL_ALPHA_SIZE, 8,
         EGL_DEPTH_SIZE, 0,
         EGL_STENCIL_SIZE, 0,
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
         EGL_NONE
     };
 
@@ -202,8 +202,12 @@
 mgx::X11EGLContext::X11EGLContext(EGLDisplay egl_dpy, EGLConfig config)
     : egl_dpy{egl_dpy}
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+
     static const EGLint ctx_attribs[] = {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
         EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
         EGL_NONE };
 
     egl_ctx = eglCreateContext(egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs);
 
=== modified file 'src/renderers/gl/program_family.cpp'
--- src/renderers/gl/program_family.cpp	2016-01-29 08:18:22 +0000
+++ src/renderers/gl/program_family.cpp	2016-05-13 09:11:33 +0000
@@ -17,7 +17,8 @@
  */
 
 #include "program_family.h"
-
+#include MIR_SERVER_GL_H
+#include MIR_SERVER_GLEXT_H
 #include <mutex>
 
 namespace mir
 
=== modified file 'src/renderers/gl/program_family.h'
--- src/renderers/gl/program_family.h	2016-01-29 08:18:22 +0000
+++ src/renderers/gl/program_family.h	2016-05-13 09:11:33 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_RENDERER_GL_PROGRAM_FAMILY_H_
 #define MIR_RENDERER_GL_PROGRAM_FAMILY_H_
 
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
 #include <utility>
 #include <map>
 #include <unordered_map>
 
=== modified file 'src/renderers/gl/renderer.cpp'
--- src/renderers/gl/renderer.cpp	2016-05-03 04:36:33 +0000
+++ src/renderers/gl/renderer.cpp	2016-05-13 09:11:33 +0000
@@ -127,7 +127,9 @@
 
 const GLchar* const mrg::Renderer::alpha_fshader =
 {
+    "#ifdef GL_ES\n"
     "precision mediump float;\n"
+    "#endif\n"
     "uniform sampler2D tex;\n"
     "uniform float alpha;\n"
     "varying vec2 v_texcoord;\n"
@@ -139,7 +141,9 @@
 
 const GLchar* const mrg::Renderer::default_fshader =
 {   // This is the fastest fragment shader. Use it when you can.
+    "#ifdef GL_ES\n"
     "precision mediump float;\n"
+    "#endif\n"
     "uniform sampler2D tex;\n"
     "varying vec2 v_texcoord;\n"
     "void main() {\n"
@@ -169,6 +173,7 @@
       orientation(mir_orientation_normal),
       mirror_mode(mir_mirror_mode_none)
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
     EGLDisplay disp = eglGetCurrentDisplay();
     if (disp != EGL_NO_DISPLAY)
     {
 
=== modified file 'src/renderers/gl/renderer.h'
--- src/renderers/gl/renderer.h	2016-05-03 04:36:33 +0000
+++ src/renderers/gl/renderer.h	2016-05-13 09:11:33 +0000
@@ -28,7 +28,7 @@
 #include <mir/gl/primitive.h>
 #include "mir/renderer/gl/render_target.h"
 
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2016-05-03 04:36:33 +0000
+++ src/server/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -84,7 +84,7 @@
 
 set(MIR_SERVER_REFERENCES
   ${EGL_LDFLAGS} ${EGL_LIBRARIES}
-  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
+  ${GL_LDFLAGS} ${GL_LIBRARIES}
   ${UDEV_LDFLAGS} ${UDEV_LIBRARIES}
   ${GLIB_LDFLAGS} ${GLIB_LIBRARIES}
   ${UUID_LDFLAGS} ${UUID_LIBRARIES}
@@ -109,7 +109,7 @@
   ${GLog_LIBRARY}
   ${GFlags_LIBRARY}
   ${EGL_LDFLAGS} ${EGL_LIBRARIES}
-  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
+  ${GL_LDFLAGS} ${GL_LIBRARIES}
   ${UDEV_LDFLAGS} ${UDEV_LIBRARIES}
   ${GLIB_LDFLAGS} ${GLIB_LIBRARIES}
   ${UUID_LDFLAGS} ${UUID_LIBRARIES}
 
=== modified file 'src/server/compositor/screencast_display_buffer.h'
--- src/server/compositor/screencast_display_buffer.h	2016-05-03 04:36:33 +0000
+++ src/server/compositor/screencast_display_buffer.h	2016-05-13 09:11:33 +0000
@@ -22,7 +22,8 @@
 #include "mir/graphics/display_buffer.h"
 #include "mir/renderer/gl/render_target.h"
 
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
+#include MIR_SERVER_GLEXT_H
 
 namespace mir
 {
 
=== modified file 'src/server/graphics/CMakeLists.txt'
--- src/server/graphics/CMakeLists.txt	2016-01-29 08:18:22 +0000
+++ src/server/graphics/CMakeLists.txt	2016-05-13 09:11:33 +0000
@@ -1,4 +1,4 @@
-include_directories(${GLESv2_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
+include_directories(${GL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
 
 add_library(
   mirgraphics OBJECT
 
=== modified file 'src/server/graphics/nested/display.cpp'
--- src/server/graphics/nested/display.cpp	2016-02-01 22:53:06 +0000
+++ src/server/graphics/nested/display.cpp	2016-05-13 09:11:33 +0000
@@ -44,7 +44,9 @@
 
 EGLint const mgn::detail::nested_egl_context_attribs[] =
 {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
     EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
     EGL_NONE
 };
 
@@ -86,14 +88,15 @@
         BOOST_THROW_EXCEPTION(mg::egl_error("Nested Mir Display Error: Failed to initialize EGL."));
     }
 
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
     pixel_format = format;
-    egl_context_ = eglCreateContext(egl_display, choose_windowed_es_config(format), EGL_NO_CONTEXT, detail::nested_egl_context_attribs);
+    egl_context_ = eglCreateContext(egl_display, choose_windowed_config(format), EGL_NO_CONTEXT, detail::nested_egl_context_attribs);
 
     if (egl_context_ == EGL_NO_CONTEXT)
         BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create shared EGL context"));
 }
 
-EGLConfig mgn::detail::EGLDisplayHandle::choose_windowed_es_config(MirPixelFormat format) const
+EGLConfig mgn::detail::EGLDisplayHandle::choose_windowed_config(MirPixelFormat format) const
 {
     EGLint const nested_egl_config_attribs[] =
     {
@@ -104,7 +107,7 @@
         EGL_ALPHA_SIZE, mg::alpha_channel_depth(format),
         EGL_DEPTH_SIZE, gl_config->depth_buffer_bits(),
         EGL_STENCIL_SIZE, gl_config->stencil_buffer_bits(),
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
         EGL_NONE
     };
     EGLConfig result;
@@ -133,7 +136,7 @@
        EGL_ALPHA_SIZE, mg::alpha_channel_depth(pixel_format),
        EGL_DEPTH_SIZE, gl_config->depth_buffer_bits(),
        EGL_STENCIL_SIZE, gl_config->stencil_buffer_bits(),
-       EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+       EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
        EGL_NONE
     };
     return std::make_unique<SurfacelessEGLContext>(egl_display, attribs, EGL_NO_CONTEXT);
@@ -205,6 +208,7 @@
 
 mgn::Display::~Display() noexcept
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
     if (eglGetCurrentContext() == egl_display.egl_context())
         eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 }
@@ -311,6 +315,7 @@
                     mir_buffer_usage_hardware,
                     static_cast<uint32_t>(best_output.id.as_value()));
 
+                eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
                 display_buffer = std::make_shared<mgn::detail::DisplaySyncGroup>(
                     std::make_shared<mgn::detail::DisplayBuffer>(
                         egl_display,
 
=== modified file 'src/server/graphics/nested/display.h'
--- src/server/graphics/nested/display.h	2016-02-01 22:53:06 +0000
+++ src/server/graphics/nested/display.h	2016-05-13 09:11:33 +0000
@@ -78,7 +78,7 @@
     ~EGLDisplayHandle() noexcept;
 
     void initialize(MirPixelFormat format);
-    EGLConfig choose_windowed_es_config(MirPixelFormat format) const;
+    EGLConfig choose_windowed_config(MirPixelFormat format) const;
     EGLContext egl_context() const;
     std::unique_ptr<graphics::GLContext> create_gl_context();
 
 
=== modified file 'src/server/graphics/nested/display_buffer.cpp'
--- src/server/graphics/nested/display_buffer.cpp	2016-05-03 04:36:33 +0000
+++ src/server/graphics/nested/display_buffer.cpp	2016-05-13 09:11:33 +0000
@@ -42,7 +42,7 @@
     MirPixelFormat preferred_format) :
     egl_display(egl_display),
     host_surface{host_surface},
-    egl_config{egl_display.choose_windowed_es_config(preferred_format)},
+    egl_config{egl_display.choose_windowed_config(preferred_format)},
     egl_context{egl_display, eglCreateContext(egl_display, egl_config, egl_display.egl_context(), nested_egl_context_attribs)},
     area{area.top_left, area.size},
     dispatcher{dispatcher},
 
=== modified file 'src/server/graphics/offscreen/display.cpp'
--- src/server/graphics/offscreen/display.cpp	2016-01-27 16:09:11 +0000
+++ src/server/graphics/offscreen/display.cpp	2016-05-13 09:11:33 +0000
@@ -150,6 +150,7 @@
         {
             if (output.connected && output.preferred_mode_index < output.modes.size())
             {
+                eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
                 auto raw_db = new mgo::DisplayBuffer{
                     SurfacelessEGLContext{egl_display, egl_context_shared},
                     output.extents()};
@@ -188,6 +189,7 @@
 
 std::unique_ptr<mg::GLContext> mgo::Display::create_gl_context()
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
     return std::make_unique<SurfacelessEGLContext>(egl_display, egl_context_shared);
 }
 
 
=== modified file 'src/server/graphics/offscreen/display_buffer.cpp'
--- src/server/graphics/offscreen/display_buffer.cpp	2016-05-03 04:36:33 +0000
+++ src/server/graphics/offscreen/display_buffer.cpp	2016-05-13 09:11:33 +0000
@@ -23,8 +23,8 @@
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
+#include MIR_SERVER_GL_H
+#include MIR_SERVER_GLEXT_H
 
 namespace mg = mir::graphics;
 namespace mgo = mg::offscreen;
@@ -57,11 +57,13 @@
     GLenum gl_color_format{GL_RGBA4};
     GLenum const gl_depth_format{GL_DEPTH_COMPONENT16};
 
+#ifdef GL_RGBA8_OES
     if (extensions.support("GL_ARM_rgba8") ||
         extensions.support("GL_OES_rgb8_rgba8"))
     {
         gl_color_format = GL_RGBA8_OES;
     }
+#endif
 
     /* Create a renderbuffer for the color attachment */
     glGenRenderbuffers(1, &color_renderbuffer);
 
=== modified file 'src/server/graphics/surfaceless_egl_context.cpp'
--- src/server/graphics/surfaceless_egl_context.cpp	2015-06-17 05:20:42 +0000
+++ src/server/graphics/surfaceless_egl_context.cpp	2016-05-13 09:11:33 +0000
@@ -120,7 +120,9 @@
 
 EGLint const default_egl_context_attr[] =
 {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
     EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
     EGL_NONE
 };
 
@@ -131,7 +133,7 @@
     EGL_GREEN_SIZE, 8,
     EGL_BLUE_SIZE, 8,
     EGL_ALPHA_SIZE, 0,
-    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+    EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
     EGL_NONE
 };
 
@@ -180,6 +182,7 @@
 
 void mg::SurfacelessEGLContext::make_current() const
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
     if (eglGetCurrentContext() == egl_context)
         return;
 
@@ -193,6 +196,7 @@
 
 void mg::SurfacelessEGLContext::release_current() const
 {
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
     if (egl_context != EGL_NO_CONTEXT && eglGetCurrentContext() == egl_context)
         eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 }
 
=== modified file 'src/server/scene/gl_pixel_buffer.cpp'
--- src/server/scene/gl_pixel_buffer.cpp	2016-01-29 08:18:22 +0000
+++ src/server/scene/gl_pixel_buffer.cpp	2016-05-13 09:11:33 +0000
@@ -23,8 +23,8 @@
 
 #include <stdexcept>
 #include <boost/throw_exception.hpp>
-
-#include <GLES2/gl2ext.h>
+#include MIR_SERVER_GL_H
+#include MIR_SERVER_GLEXT_H
 
 namespace mg = mir::graphics;
 namespace ms = mir::scene;
 
=== modified file 'src/server/scene/gl_pixel_buffer.h'
--- src/server/scene/gl_pixel_buffer.h	2014-03-06 06:05:17 +0000
+++ src/server/scene/gl_pixel_buffer.h	2016-05-13 09:11:33 +0000
@@ -24,7 +24,7 @@
 #include <memory>
 #include <vector>
 
-#include <GLES2/gl2.h>
+#include MIR_SERVER_GL_H
 
 namespace mir
 {
 
=== modified file 'tests/unit-tests/graphics/test_shm_buffer.cpp'
--- tests/unit-tests/graphics/test_shm_buffer.cpp	2016-04-01 06:57:58 +0000
+++ tests/unit-tests/graphics/test_shm_buffer.cpp	2016-05-13 09:11:33 +0000
@@ -162,7 +162,7 @@
 TEST_F(ShmBufferTest, uploads_xrgb_8888_correctly)
 {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-    EXPECT_CALL(mock_gl, glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+    EXPECT_CALL(mock_gl, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
                                       size.width.as_int(), size.height.as_int(),
                                       0, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
                                       stub_shm_file->fake_mapping));
@@ -174,7 +174,7 @@
 TEST_F(ShmBufferTest, uploads_argb_8888_correctly)
 {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-    EXPECT_CALL(mock_gl, glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+    EXPECT_CALL(mock_gl, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
                                       size.width.as_int(), size.height.as_int(),
                                       0, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
                                       stub_shm_file->fake_mapping));