From c632e29ec09f98789702ca09c320827d73147011 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Fri, 17 Nov 2023 11:24:20 +0100
Subject: [PATCH] cogl: Don't use a separate file for egl defines

The file doesn't do anything special to require a special header

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3405>
---
 cogl/cogl/cogl-egl-defines.h     | 39 --------------------------------
 cogl/cogl/cogl-egl-private.h     |  2 +-
 cogl/cogl/cogl-egl.h             |  5 +++-
 cogl/cogl/cogl-texture-2d.h      |  2 +-
 cogl/cogl/cogl-texture-private.h |  2 +-
 cogl/cogl/meson.build            |  1 -
 6 files changed, 7 insertions(+), 44 deletions(-)
 delete mode 100644 cogl/cogl/cogl-egl-defines.h

diff --git a/cogl/cogl/cogl-egl-defines.h b/cogl/cogl/cogl-egl-defines.h
deleted file mode 100644
index 292a6d949..000000000
--- a/cogl/cogl/cogl-egl-defines.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Cogl
- *
- * A Low Level GPU Graphics and Utilities API
- *
- * Copyright (C) 2007,2008,2009,2010 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 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.
- *
- *
- */
-
-#pragma once
-
-#ifdef HAVE_EGL
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <EGL/eglmesaext.h>
-
-#endif /* HAVE_EGL */
diff --git a/cogl/cogl/cogl-egl-private.h b/cogl/cogl/cogl-egl-private.h
index fa9a48799..5e9ae0212 100644
--- a/cogl/cogl/cogl-egl-private.h
+++ b/cogl/cogl/cogl-egl-private.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl/cogl-egl-defines.h"
+#include "cogl/cogl-egl.h"
 
 #if defined(GL_OES_EGL_image) && !defined(GLeglImageOES)
 #define GLeglImageOES void *
diff --git a/cogl/cogl/cogl-egl.h b/cogl/cogl/cogl-egl.h
index 5d8ab5a96..deef1de2b 100644
--- a/cogl/cogl/cogl-egl.h
+++ b/cogl/cogl/cogl-egl.h
@@ -30,7 +30,10 @@
 
 #pragma once
 
-#include "cogl/cogl-egl-defines.h"
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>
+
 #include "cogl/cogl-types.h"
 
 G_BEGIN_DECLS
diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h
index 30bb8a556..080f55a55 100644
--- a/cogl/cogl/cogl-texture-2d.h
+++ b/cogl/cogl/cogl-texture-2d.h
@@ -40,7 +40,7 @@
 #include "cogl/cogl-bitmap.h"
 
 #ifdef HAVE_EGL
-#include "cogl/cogl-egl-defines.h"
+#include "cogl/cogl-egl.h"
 #endif
 
 G_BEGIN_DECLS
diff --git a/cogl/cogl/cogl-texture-private.h b/cogl/cogl/cogl-texture-private.h
index 8c8a89225..5f28a7474 100644
--- a/cogl/cogl/cogl-texture-private.h
+++ b/cogl/cogl/cogl-texture-private.h
@@ -38,7 +38,7 @@
 #include "cogl/cogl-texture-2d.h"
 
 #ifdef HAVE_EGL
-#include "cogl/cogl-egl-defines.h"
+#include "cogl/cogl-egl.h"
 #endif
 
 /* Encodes three possibiloities result of transforming a quad */
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index fe44d6b18..59f2990a9 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -330,7 +330,6 @@ endif
 if have_egl
   cogl_nonintrospected_headers += [
     'cogl-egl.h',
-    'cogl-egl-defines.h',
   ]
   cogl_sources += [
     'cogl-egl-private.h',