egl: drop now empty egl_dri2_fallbacks.h

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5861>

diff --git a/src/egl/Makefile.sources b/src/egl/Makefile.sources
index 5efdb337836964b35e430785952e3220dff2e546..da1fce11de133436ea73325e713d506969cce685 100644 (file)
--- 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 (file)
index 1fc7b8e..0000000
--- 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 bee601c1fdd69693610d60a3b785cb2fcb5fae59..6bcb1dcc5293ad855537cf25ecb2400280292fe8 100644 (file)
--- 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 25b6cad1802dd4b7b019e944d51c654def0d8253..3aac62f2679e619ef5da7a4eba046f815db17b46 100644 (file)
--- 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 f986e100546427b00d7bdccca4d470d7894536b8..d7b64338d3abd0b8b7ef5f3e14f57965774010d1 100644 (file)
--- 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 2569715ebcbd19b5851ba6ed65a24e0ec76e4d3e..c6761395a0ca45feb9f96ba00f7d3b9ff9a34f0f 100644 (file)
--- 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 8488d463f357b6792c1df350c2438a94a116906d..f65eca1494f94e39574d63961057bfe4686906ab 100644 (file)
--- 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 0ccc2b34bff12bc48809dc1783129290b36cfe76..8732a70c019d8a5fac5427fe74de54a4116059c2 100644 (file)
--- 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 f525771ee0d3851e44d1283495c5014a6f0f81d0..f230fcabb5b65a1cf132ba5b7cf21c056e35b785 100644 (file)
--- 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 29d22b1cb20597869811cb1e00ec0cc9072fc52e..d4912a6564410e2311bda93f0380d857ca3c9f20 100644 (file)
--- 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