From f6e50994e12f1135748a51bf6380dc04bd5f4907 Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Tue, 6 May 2014 12:10:56 -0700 Subject: [PATCH] Import eglextchromium.h from Chromium. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In order to support the (currently unregistered) Chromium-specific EGL extension eglGetSyncValuesCHROMIUM on Intel systems, we need to import the Chromium header that defines it. The file was downloaded from https://chromium.googlesource.com/chromium/chromium/+/trunk/ui/gl/EGL/eglextchromium.h It is subject to the license found at https://chromium.googlesource.com/chromium/chromium/+/trunk/LICENSE I have imported the header file and added the license text to the top. The only change was to fix the include guard on the Chromium header to change the last line from a #define to a #endif, which makes the header actually compile. Signed-off-by: Sarah Sharp Reviewed-by: Chad Versace Cc: Jamey Sharp Cc: Ian Romanick Cc: Stéphane Marchesin --- include/EGL/eglext.h | 1 + include/EGL/eglextchromium.h | 60 ++++++++++++++++++++++++++++++++++++ src/egl/main/Makefile.am | 1 + 3 files changed, 62 insertions(+) create mode 100644 include/EGL/eglextchromium.h diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h index 243da4a0a53..88b39dbc4f7 100644 --- a/include/EGL/eglext.h +++ b/include/EGL/eglext.h @@ -646,6 +646,7 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); #endif /* EGL_NV_system_time */ #include +#include #ifdef __cplusplus } diff --git a/include/EGL/eglextchromium.h b/include/EGL/eglextchromium.h new file mode 100644 index 00000000000..0cc097658cf --- /dev/null +++ b/include/EGL/eglextchromium.h @@ -0,0 +1,60 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// This file contains Chromium-specific EGL extensions declarations. + +#ifndef GPU_EGL_EGLEXTCHROMIUM_H_ +#define GPU_EGL_EGLEXTCHROMIUM_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/* EGLSyncControlCHROMIUM requires 64-bit uint support */ +#if KHRONOS_SUPPORT_INT64 +#ifndef EGL_CHROMIUM_sync_control +#define EGL_CHROMIUM_sync_control 1 +typedef khronos_uint64_t EGLuint64CHROMIUM; +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM( + EGLDisplay dpy, EGLSurface surface, EGLuint64CHROMIUM *ust, + EGLuint64CHROMIUM *msc, EGLuint64CHROMIUM *sbc); +#endif /* EGL_EGLEXT_PROTOTYPES */ +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCVALUESCHROMIUMPROC) + (EGLDisplay dpy, EGLSurface surface, EGLuint64CHROMIUM *ust, + EGLuint64CHROMIUM *msc, EGLuint64CHROMIUM *sbc); +#endif +#endif + +#ifdef __cplusplus +} +#endif + +#endif // GPU_EGL_EGLEXTCHROMIUM_H_ diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am index 2858913eae8..23207db8ae1 100644 --- a/src/egl/main/Makefile.am +++ b/src/egl/main/Makefile.am @@ -126,5 +126,6 @@ egldir = $(includedir)/EGL egl_HEADERS = \ $(top_srcdir)/include/EGL/eglext.h \ $(top_srcdir)/include/EGL/egl.h \ + $(top_srcdir)/include/EGL/eglextchromium.h \ $(top_srcdir)/include/EGL/eglmesaext.h \ $(top_srcdir)/include/EGL/eglplatform.h -- 2.30.2