eglGetProcAddress fails the same way on MIR as ANDROID does on arm. Thanks Sylvain Becker for the patch!
authorBrandon Schaefer <brandon.schaefer@canonical.com>
Tue, 06 May 2014 15:08:43 -0700
changeset 8753497e72bba21b
parent 8752 44d31ae3d104
child 8754 162dc8eaa609
eglGetProcAddress fails the same way on MIR as ANDROID does on arm. Thanks Sylvain Becker for the patch!
src/video/SDL_egl.c
src/video/mir/SDL_mirwindow.c
     1.1 --- a/src/video/SDL_egl.c	Tue May 06 00:20:34 2014 -0400
     1.2 +++ b/src/video/SDL_egl.c	Tue May 06 15:08:43 2014 -0700
     1.3 @@ -77,7 +77,7 @@
     1.4      void *retval;
     1.5      
     1.6      /* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */
     1.7 -#if !defined(SDL_VIDEO_DRIVER_ANDROID) 
     1.8 +#if !defined(SDL_VIDEO_DRIVER_ANDROID) && !defined(SDL_VIDEO_DRIVER_MIR) 
     1.9      if (_this->egl_data->eglGetProcAddress) {
    1.10          retval = _this->egl_data->eglGetProcAddress(proc);
    1.11          if (retval) {
     2.1 --- a/src/video/mir/SDL_mirwindow.c	Tue May 06 00:20:34 2014 -0400
     2.2 +++ b/src/video/mir/SDL_mirwindow.c	Tue May 06 15:08:43 2014 -0700
     2.3 @@ -84,7 +84,8 @@
     2.4          .width = window->w,
     2.5          .height = window->h,
     2.6          .pixel_format = mir_pixel_format_invalid,
     2.7 -        .buffer_usage = mir_buffer_usage_hardware
     2.8 +        .buffer_usage = mir_buffer_usage_hardware,
     2.9 +        .output_id = mir_display_output_id_invalid
    2.10      };
    2.11  
    2.12      MirEventDelegate delegate = {