diff options
author | Eric Engestrom <[email protected]> | 2019-06-25 13:47:04 +0100 |
---|---|---|
committer | Marge Bot <[email protected]> | 2020-07-10 13:48:23 +0000 |
commit | a38e21d6683aeecb51aea4f933a77c6e7f1a6179 (patch) | |
tree | 503a253030dbe300033cf2e3dedf94312825d997 /src | |
parent | e66e0c0c2d017722f6ffba114a140fec683652e0 (diff) |
egl: always compile surfaceless
It has no dependencies and costs virtually nothing to build. There is
no downside to enabling it unconditionally, so let's do just that.
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3161>
Diffstat (limited to 'src')
-rw-r--r-- | src/egl/drivers/dri2/egl_dri2.h | 8 | ||||
-rw-r--r-- | src/egl/main/eglapi.c | 2 | ||||
-rw-r--r-- | src/egl/main/egldisplay.c | 2 | ||||
-rw-r--r-- | src/egl/main/egldisplay.h | 2 | ||||
-rw-r--r-- | src/egl/main/eglglobals.c | 2 | ||||
-rw-r--r-- | src/egl/meson.build | 8 |
6 files changed, 4 insertions, 20 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 3da538c7dc9..38fa7c6a474 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -503,16 +503,8 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp) } #endif -#ifdef HAVE_SURFACELESS_PLATFORM EGLBoolean dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp); -#else -static inline EGLBoolean -dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp) -{ - return _eglError(EGL_NOT_INITIALIZED, "Surfaceless platform not built"); -} -#endif EGLBoolean dri2_initialize_device(_EGLDriver *drv, _EGLDisplay *disp); diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 85bd05723c8..e24a2672d0c 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -401,11 +401,9 @@ _eglGetPlatformDisplayCommon(EGLenum platform, void *native_display, attrib_list); break; #endif -#ifdef HAVE_SURFACELESS_PLATFORM case EGL_PLATFORM_SURFACELESS_MESA: disp = _eglGetSurfacelessDisplay(native_display, attrib_list); break; -#endif #ifdef HAVE_ANDROID_PLATFORM case EGL_PLATFORM_ANDROID_KHR: disp = _eglGetAndroidDisplay(native_display, attrib_list); diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index 8cf9cb83a91..2cafc74db6f 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -534,7 +534,6 @@ _eglGetWaylandDisplay(struct wl_display *native_display, } #endif /* HAVE_WAYLAND_PLATFORM */ -#ifdef HAVE_SURFACELESS_PLATFORM _EGLDisplay* _eglGetSurfacelessDisplay(void *native_display, const EGLAttrib *attrib_list) @@ -554,7 +553,6 @@ _eglGetSurfacelessDisplay(void *native_display, return _eglFindDisplay(_EGL_PLATFORM_SURFACELESS, native_display, attrib_list); } -#endif /* HAVE_SURFACELESS_PLATFORM */ #ifdef HAVE_ANDROID_PLATFORM _EGLDisplay* diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 02ac4fb9a9d..951679ba0f0 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -309,11 +309,9 @@ _eglGetWaylandDisplay(struct wl_display *native_display, const EGLAttrib *attrib_list); #endif -#ifdef HAVE_SURFACELESS_PLATFORM _EGLDisplay* _eglGetSurfacelessDisplay(void *native_display, const EGLAttrib *attrib_list); -#endif #ifdef HAVE_ANDROID_PLATFORM _EGLDisplay* diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c index f5814b2b2a1..f39cbfe4489 100644 --- a/src/egl/main/eglglobals.c +++ b/src/egl/main/eglglobals.c @@ -95,9 +95,7 @@ struct _egl_global _eglGlobal = " EGL_MESA_platform_gbm" " EGL_KHR_platform_gbm" #endif -#ifdef HAVE_SURFACELESS_PLATFORM " EGL_MESA_platform_surfaceless" -#endif "", .debugCallback = NULL, diff --git a/src/egl/meson.build b/src/egl/meson.build index 7996a4ac2fa..109e230144b 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -96,7 +96,10 @@ if with_dri2 link_for_egl += libloader incs_for_egl += inc_loader - files_egl += files('drivers/dri2/platform_device.c') + files_egl += files( + 'drivers/dri2/platform_device.c', + 'drivers/dri2/platform_surfaceless.c', + ) if with_platform_x11 files_egl += files('drivers/dri2/platform_x11.c') if with_dri3 @@ -111,9 +114,6 @@ if with_dri2 incs_for_egl += [inc_gbm, include_directories('../gbm/main')] deps_for_egl += dep_libdrm endif - if with_platform_surfaceless - files_egl += files('drivers/dri2/platform_surfaceless.c') - endif if with_platform_wayland deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers] link_for_egl += libwayland_drm |