eglGetProcAddress fails the same way on MIR as ANDROID does on arm. T…

…hanks Sylvain Becker for the patch!
libsdl-org · May 6, 2014 · b614809 · b614809
1 parent e7bccd1
commit b614809
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 = {