mirror of
git://slackware.nl/current.git
synced 2025-01-13 08:01:53 +01:00
63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
|
From 51233cc52cbcbe25f8461830913c06f5b5bc9508 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Jackson <ajax@redhat.com>
|
||
|
|
Date: Thu, 17 Oct 2019 11:51:37 -0400
|
||
|
|
Subject: [PATCH] egl: Sync with Khronos
|
||
|
|
|
||
|
|
commit de3a5e867d906a04a5c37ee0d89e7f01d3598eb9
|
||
|
|
Author: Ken Russell <kbrussel@alum.mit.edu>
|
||
|
|
Date: Sat Oct 12 05:44:43 2019 -0700
|
||
|
|
|
||
|
|
Reserve enums 0x34A0..0x34AF for ANGLE project. (#93)
|
||
|
|
|
||
|
|
Closes: https://gitlab.freedesktop.org/glvnd/libglvnd/issues/193
|
||
|
|
---
|
||
|
|
include/EGL/eglplatform.h | 6 ++++++
|
||
|
|
src/generate/xml/egl.xml | 7 +++++--
|
||
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
|
||
|
|
index 29ab288..5ab49c1 100644
|
||
|
|
--- a/include/EGL/eglplatform.h
|
||
|
|
+++ b/include/EGL/eglplatform.h
|
||
|
|
@@ -116,6 +116,12 @@ typedef intptr_t EGLNativeDisplayType;
|
||
|
|
typedef intptr_t EGLNativePixmapType;
|
||
|
|
typedef intptr_t EGLNativeWindowType;
|
||
|
|
|
||
|
|
+#elif defined(__unix__) && defined(EGL_NO_X11)
|
||
|
|
+
|
||
|
|
+typedef void *EGLNativeDisplayType;
|
||
|
|
+typedef khronos_uintptr_t EGLNativePixmapType;
|
||
|
|
+typedef khronos_uintptr_t EGLNativeWindowType;
|
||
|
|
+
|
||
|
|
#elif defined(__unix__) || defined(USE_X11)
|
||
|
|
|
||
|
|
/* X11 (tentative) */
|
||
|
|
diff --git a/src/generate/xml/egl.xml b/src/generate/xml/egl.xml
|
||
|
|
index c27f172..6bc2ea2 100644
|
||
|
|
--- a/src/generate/xml/egl.xml
|
||
|
|
+++ b/src/generate/xml/egl.xml
|
||
|
|
@@ -1002,6 +1002,9 @@
|
||
|
|
<enum value="0x3490" name="EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT"/>
|
||
|
|
<unused start="0x3491" end="0x349F"/>
|
||
|
|
</enums>
|
||
|
|
+ <enums namespace="EGL" start="0x34A0" end="0x34AF" vendor="ANGLE" comment="Reserved for Ken Russell - ANGLE (via github pull request)">
|
||
|
|
+ <unused start="0x34A0" end="0x34AF"/>
|
||
|
|
+ </enums>
|
||
|
|
|
||
|
|
<!-- Please remember that new enumerant allocations must be obtained by
|
||
|
|
request to the Khronos API registrar (see comments at the top of this
|
||
|
|
@@ -1012,8 +1015,8 @@
|
||
|
|
|
||
|
|
<!-- Reservable for future use. To generate a new range, allocate multiples
|
||
|
|
of 16 starting at the lowest available point in this block. -->
|
||
|
|
- <enums namespace="EGL" start="0x34A0" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
|
||
|
|
- <unused start="0x34A0" end="0x3FFF"/>
|
||
|
|
+ <enums namespace="EGL" start="0x34B0" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
|
||
|
|
+ <unused start="0x34B0" end="0x3FFF"/>
|
||
|
|
</enums>
|
||
|
|
|
||
|
|
<enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|