isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-26 21:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Don't use a separate file for egl defines

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

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3405>
This commit is contained in:
Bilal Elmoussaoui 2023-11-17 11:24:20 +01:00 committed by Marge Bot
parent a8f77750fd
commit c632e29ec0
6 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cogl/cogl/cogl-egl-defines.h
View File

@ -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 */

2
cogl/cogl/cogl-egl-private.h
View File

@ -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 *

5
cogl/cogl/cogl-egl.h
View File

@ -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

2
cogl/cogl/cogl-texture-2d.h
View File

@ -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

2
cogl/cogl/cogl-texture-private.h
View File

@ -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 */

1
cogl/cogl/meson.build
View File

@ -330,7 +330,6 @@ endif
if have_egl
cogl_nonintrospected_headers += [
'cogl-egl.h',
'cogl-egl-defines.h',
]
cogl_sources += [
'cogl-egl-private.h',