Corrected mesa patch:
diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index da8136c..d587ee9 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -60,7 +60,7 @@ #include <sys/stat.h> #endif #ifdef HAVE_MIR_PLATFORM -#include <mir_client_library.h> +#include <mir/client/mir_toolkit/mesa/native_display.h> #endif
/** @@ -158,7 +158,7 @@ _eglNativePlatformDetectNativeDisplay(EGLNativeDisplayType nativeDisplay) #endif
#ifdef HAVE_MIR_PLATFORM - if (mir_connection_is_valid(nativeDisplay)) + if (mir_egl_mesa_display_is_valid((MirMesaEGLNativeDisplay *)nativeDisplay)) return _EGL_PLATFORM_MIR; #endif
@@ -196,7 +196,7 @@ _eglNativePlatformDetectNativeDisplay(EGLNativeDisplayType nativeDisplay) _EGLPlatformType _eglGetNativePlatform(EGLNativeDisplayType nativeDisplay) { - static _EGLPlatformType native_platform = _EGL_INVALID_PLATFORM; + _EGLPlatformType native_platform = _EGL_INVALID_PLATFORM; char *detection_method = NULL;
if (native_platform == _EGL_INVALID_PLATFORM) { diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index ffdd146..292adad 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -200,8 +200,8 @@ _eglLoadModule(_EGLModule *mod) lib_handle lib; _EGLDriver *drv;
- if (mod->Driver) - return EGL_TRUE;
if (mod->BuiltIn) { lib = (lib_handle) NULL;
« Back to merge proposal
Corrected mesa patch:
diff --git a/src/egl/ main/egldisplay .c b/src/egl/ main/egldisplay .c main/egldisplay .c main/egldisplay .c library. h> mir_toolkit/ mesa/native_ display. h>
index da8136c..d587ee9 100644
--- a/src/egl/
+++ b/src/egl/
@@ -60,7 +60,7 @@
#include <sys/stat.h>
#endif
#ifdef HAVE_MIR_PLATFORM
-#include <mir_client_
+#include <mir/client/
#endif
/** ormDetectNative Display( EGLNativeDispla yType nativeDisplay)
@@ -158,7 +158,7 @@ _eglNativePlatf
#endif
#ifdef HAVE_MIR_PLATFORM _is_valid( nativeDisplay) ) mesa_display_ is_valid( (MirMesaEGLNati veDisplay *)nativeDisplay))
- if (mir_connection
+ if (mir_egl_
return _EGL_PLATFORM_MIR;
#endif
@@ -196,7 +196,7 @@ _eglNativePlatf ormDetectNative Display( EGLNativeDispla yType nativeDisplay) latform( EGLNativeDispla yType nativeDisplay) PLATFORM; PLATFORM;
_EGLPlatformType
_eglGetNativeP
{
- static _EGLPlatformType native_platform = _EGL_INVALID_
+ _EGLPlatformType native_platform = _EGL_INVALID_
char *detection_method = NULL;
if (native_platform == _EGL_INVALID_ PLATFORM) { main/egldriver. c b/src/egl/ main/egldriver. c main/egldriver. c main/egldriver. c _EGLModule *mod)
diff --git a/src/egl/
index ffdd146..292adad 100644
--- a/src/egl/
+++ b/src/egl/
@@ -200,8 +200,8 @@ _eglLoadModule(
lib_handle lib;
_EGLDriver *drv;
- if (mod->Driver)
- return EGL_TRUE;
if (mod->BuiltIn) {
lib = (lib_handle) NULL;