Browse Source

eglGetProcAddress fails the same way on MIR as ANDROID does on arm. Thanks Sylvain Becker for the patch!

Brandon Schaefer 12 năm trước cách đây
mục cha
commit
b614809203

+ 1 - 1
src/video/SDL_egl.c

@@ -77,7 +77,7 @@ SDL_EGL_GetProcAddress(_THIS, const char *proc)
     void *retval;
     void *retval;
     
     
     /* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */
     /* 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) {
     if (_this->egl_data->eglGetProcAddress) {
         retval = _this->egl_data->eglGetProcAddress(proc);
         retval = _this->egl_data->eglGetProcAddress(proc);
         if (retval) {
         if (retval) {

+ 2 - 1
src/video/mir/SDL_mirwindow.c

@@ -84,7 +84,8 @@ MIR_CreateWindow(_THIS, SDL_Window* window)
         .width = window->w,
         .width = window->w,
         .height = window->h,
         .height = window->h,
         .pixel_format = mir_pixel_format_invalid,
         .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 = {
     MirEventDelegate delegate = {