From b6148092037f88032a2ca4f4fb155d2483ebaa84 Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Tue, 6 May 2014 15:08:43 -0700
Subject: [PATCH] eglGetProcAddress fails the same way on MIR as ANDROID does
 on arm. Thanks Sylvain Becker for the patch!

---
 src/video/SDL_egl.c           | 2 +-
 src/video/mir/SDL_mirwindow.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
index f826899b3660c..a95b73b8825cf 100644
--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@@ -77,7 +77,7 @@ SDL_EGL_GetProcAddress(_THIS, const char *proc)
     void *retval;
     
     /* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */
-#if !defined(SDL_VIDEO_DRIVER_ANDROID) 
+#if !defined(SDL_VIDEO_DRIVER_ANDROID) && !defined(SDL_VIDEO_DRIVER_MIR) 
     if (_this->egl_data->eglGetProcAddress) {
         retval = _this->egl_data->eglGetProcAddress(proc);
         if (retval) {
diff --git a/src/video/mir/SDL_mirwindow.c b/src/video/mir/SDL_mirwindow.c
index 2359c5129a16a..09d409cfa427e 100644
--- a/src/video/mir/SDL_mirwindow.c
+++ b/src/video/mir/SDL_mirwindow.c
@@ -84,7 +84,8 @@ MIR_CreateWindow(_THIS, SDL_Window* window)
         .width = window->w,
         .height = window->h,
         .pixel_format = mir_pixel_format_invalid,
-        .buffer_usage = mir_buffer_usage_hardware
+        .buffer_usage = mir_buffer_usage_hardware,
+        .output_id = mir_display_output_id_invalid
     };
 
     MirEventDelegate delegate = {