We upstreamed the changes here so it is no longer necessary to maintain
a fork.

Bug: angleproject:3706
Change-Id: I21cc63cb94f8b3603d75ce8ec86b856514a8cb5d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1749335
Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>
Reviewed-by: Tim Van Patten <timvp@google.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Jamie Madill 2019-08-12 16:55:23 -04:00 коммит произвёл Commit Bot
Родитель 9e14a19bb8
Коммит 9e4b116ccc
2 изменённых файлов: 2 добавлений и 30 удалений

Просмотреть файл

@ -1,28 +0,0 @@
# ANGLE EGL Headers
The EGL headers ANGLE uses are generated using the Khronos tools but modified to include function pointer types and function prototype guards.
### Regenerating EGL.h
1. Install **Python 3** (not 2) with the **lxml** addon. You can do this using `pip install lxml` from your Python's Scripts folder.
1. Clone [https://github.com/KhronosGroup/EGL-Registry.git](https://github.com/KhronosGroup/EGL-Registry.git).
1. Edit `EGL-Registry/api/genheaders.py` and add the following under `glesProtoPrefixStrings`:
```# EGL headers use a protection mechanism similar to GLES.
eglProtoPrefixStrings = [
'#ifndef EGL_EGL_PROTOTYPES',
'#define EGL_EGL_PROTOTYPES 1',
'#endif',
''
]
```
4. Also in `EGL-Registry/api/genheaders.py`:
1. Look for the section titled `# EGL API - EGL/egl.h (no function pointers, yet @@@)`
1. Set `prefixText` to `prefixStrings + eglPlatformStrings + eglProtoPrefixStrings + genDateCommentString`
1. Change `genFuncPointers = False,` to `genFuncPointers = True,`
1. Change `protectProto = False,` to `protectProto = 'nonzero',`
1. Change `protectProtoStr = 'EGL_EGLEXT_PROTOTYPES',` to `protectProtoStr = 'EGL_EGL_PROTOTYPES',`
1. Set your working directory to `EGL-Registry/api/`.
1. Run `python genheaders.py -registry egl.xml EGL/egl.h`
1. The generated header will now be in `EGL-Registry/api/EGL/egl.h`. You can copy the header over to this folder.
1. Also update `scripts/egl.xml` with the latest version from `EGL-Registry/api/`.

Просмотреть файл

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at ** used to make the header, and the header can be found at
** http://www.khronos.org/registry/egl ** http://www.khronos.org/registry/egl
** **
** Khronos $Git commit SHA1: d738c39fe2 $ on $Git commit date: 2019-06-14 16:17:31 -0600 $ ** Khronos $Git commit SHA1: cb927ca98d $ on $Git commit date: 2019-08-08 01:05:38 -0700 $
*/ */
#include <EGL/eglplatform.h> #include <EGL/eglplatform.h>
@ -42,7 +42,7 @@ extern "C" {
#define EGL_EGL_PROTOTYPES 1 #define EGL_EGL_PROTOTYPES 1
#endif #endif
/* Generated on date 20190716 */ /* Generated on date 20190808 */
/* Generated C header for: /* Generated C header for:
* API: egl * API: egl