Module: Mesa Branch: master Commit: 4dc322c4c6720733cce793846e4fb140c1b4403f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4dc322c4c6720733cce793846e4fb140c1b4403f
Author: Eric Engestrom <[email protected]> Date: Sat Jul 11 00:44:22 2020 +0200 egl: drop now empty egl_dri2_fallbacks.h Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Frank Binns <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5861> --- src/egl/Makefile.sources | 3 +-- src/egl/drivers/dri2/egl_dri2_fallbacks.h | 31 ----------------------------- src/egl/drivers/dri2/platform_android.c | 1 - src/egl/drivers/dri2/platform_device.c | 1 - src/egl/drivers/dri2/platform_drm.c | 1 - src/egl/drivers/dri2/platform_surfaceless.c | 1 - src/egl/drivers/dri2/platform_wayland.c | 1 - src/egl/drivers/dri2/platform_x11.c | 1 - src/egl/drivers/dri2/platform_x11_dri3.c | 1 - src/egl/meson.build | 1 - 10 files changed, 1 insertion(+), 41 deletions(-) diff --git a/src/egl/Makefile.sources b/src/egl/Makefile.sources index 5efdb337836..da1fce11de1 100644 --- a/src/egl/Makefile.sources +++ b/src/egl/Makefile.sources @@ -31,5 +31,4 @@ LIBEGL_C_FILES := \ dri2_backend_core_FILES := \ drivers/dri2/egl_dri2.c \ - drivers/dri2/egl_dri2.h \ - drivers/dri2/egl_dri2_fallbacks.h + drivers/dri2/egl_dri2.h diff --git a/src/egl/drivers/dri2/egl_dri2_fallbacks.h b/src/egl/drivers/dri2/egl_dri2_fallbacks.h deleted file mode 100644 index 1fc7b8ea167..00000000000 --- a/src/egl/drivers/dri2/egl_dri2_fallbacks.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2014 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef EGL_DRI2_FALLBACKS_INCLUDED -#define EGL_DRI2_FALLBACKS_INCLUDED - -#include "eglcurrent.h" -#include "egltypedefs.h" - -#endif /* EGL_DRI2_FALLBACKS_INCLUDED */ diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index bee601c1fdd..6bcb1dcc529 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -43,7 +43,6 @@ #include "loader.h" #include "egl_dri2.h" -#include "egl_dri2_fallbacks.h" #ifdef HAVE_DRM_GRALLOC #include <gralloc_drm_handle.h> diff --git a/src/egl/drivers/dri2/platform_device.c b/src/egl/drivers/dri2/platform_device.c index 25b6cad1802..3aac62f2679 100644 --- a/src/egl/drivers/dri2/platform_device.c +++ b/src/egl/drivers/dri2/platform_device.c @@ -40,7 +40,6 @@ #include <unistd.h> #include "egl_dri2.h" -#include "egl_dri2_fallbacks.h" #include "loader.h" static __DRIimage* diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index f986e100546..d7b64338d3a 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -39,7 +39,6 @@ #include "util/os_file.h" #include "egl_dri2.h" -#include "egl_dri2_fallbacks.h" #include "loader.h" static struct gbm_bo * diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index 2569715ebcb..c6761395a0c 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -34,7 +34,6 @@ #include <unistd.h> #include "egl_dri2.h" -#include "egl_dri2_fallbacks.h" #include "loader.h" static __DRIimage* diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 8488d463f35..f65eca1494f 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -40,7 +40,6 @@ #include <sys/mman.h> #include "egl_dri2.h" -#include "egl_dri2_fallbacks.h" #include "loader.h" #include "util/u_vector.h" #include "util/anon_file.h" diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 0ccc2b34bff..8732a70c019 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -45,7 +45,6 @@ #include "util/bitscan.h" #include "egl_dri2.h" -#include "egl_dri2_fallbacks.h" #include "loader.h" #ifdef HAVE_DRI3 diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c index f525771ee0d..f230fcabb5b 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.c +++ b/src/egl/drivers/dri2/platform_x11_dri3.c @@ -33,7 +33,6 @@ #include "util/macros.h" #include "egl_dri2.h" -#include "egl_dri2_fallbacks.h" #include "platform_x11_dri3.h" #include "loader.h" diff --git a/src/egl/meson.build b/src/egl/meson.build index 29d22b1cb20..d4912a65644 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -90,7 +90,6 @@ if with_dri2 files_egl += files( 'drivers/dri2/egl_dri2.c', 'drivers/dri2/egl_dri2.h', - 'drivers/dri2/egl_dri2_fallbacks.h', ) deps_for_egl += idep_xmlconfig link_for_egl += libloader _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
