From aa81278153d73ddaa84a7252b25cb7fe7fc8e2e9 Mon Sep 17 00:00:00 2001
From: stonesxd <shixindong@huawei.com>
Date: Tue, 4 Jan 2022 20:03:28 +0800
Subject: [PATCH 1/2] Reserve-enum-values-for-openharmony

Signed-off-by: stonesxd <shixindong@huawei.com>
Change-Id: I47d6c0f4bf5047f2d41fd78a3b964b394af6af92
---
 api/egl.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/egl.xml b/api/egl.xml
index 1c18156..82424d5 100644
--- a/api/egl.xml
+++ b/api/egl.xml
@@ -1055,6 +1055,10 @@
     <enums namespace="EGL" start="0x34D0" end="0x34DF" vendor="ANGLE" comment="Reserved for Peng Huang - ANGLE (via github pull request)">
             <unused start="0x34D0" end="0x34DF"/>
     </enums>
+
+    <enums namespace="EGL" start="0x34E0" end="0x34EF" vendor="Huawei" comment="Reserved for Openharmony OS (via github pull request)">
+            <unused start="0x34E0" end="0x34EF"/>
+    </enums>
 <!-- Please remember that new enumerant allocations must be obtained by
      request to the Khronos API registrar (see comments at the top of this
      file) File requests in the Khronos Bugzilla, EGL project, Registry
@@ -1064,8 +1068,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="0x34E0" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
-            <unused start="0x34E0" end="0x3FFF"/>
+    <enums namespace="EGL" start="0x34F0" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
+            <unused start="0x34F0" end="0x3FFF"/>
     </enums>
 
     <enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
-- 
Gitee


From 943ee2a1f324e99dc79f54840ae858c69085104d Mon Sep 17 00:00:00 2001
From: stonesxd <shixindong@huawei.com>
Date: Wed, 5 Jan 2022 15:16:58 +0800
Subject: [PATCH 2/2] Adding-KHR_platform_ohos and EGL_OHOS_image_native_buffer

Signed-off-by: stonesxd <shixindong@huawei.com>
Change-Id: Ia2c7eaab43d3842ab6a0b2fec4f565827c7c4f3f
---
 api/EGL/egl.h                                 |   4 +-
 api/EGL/eglext.h                              |  14 ++-
 api/egl.xml                                   |  14 ++-
 extensions/KHR/EGL_KHR_platform_ohos.txt      |  86 ++++++++++++++
 .../OH/EGL_OHOS_image_native_buffer.txt       | 109 ++++++++++++++++++
 index.php                                     |   4 +
 registry.tcl                                  |  12 +-
 7 files changed, 237 insertions(+), 6 deletions(-)
 create mode 100644 extensions/KHR/EGL_KHR_platform_ohos.txt
 create mode 100644 extensions/OH/EGL_OHOS_image_native_buffer.txt

diff --git a/api/EGL/egl.h b/api/EGL/egl.h
index c419152..b9ec7c1 100644
--- a/api/EGL/egl.h
+++ b/api/EGL/egl.h
@@ -14,7 +14,7 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.khronos.org/registry/egl
 **
-** Khronos $Git commit SHA1: 8c62b915dd $ on $Git commit date: 2021-11-05 23:32:01 -0400 $
+** Khronos $Git commit SHA1: 76c9410321 $ on $Git commit date: 2022-01-04 20:51:44 +0800 $
 */
 
 #include <EGL/eglplatform.h>
@@ -23,7 +23,7 @@ extern "C" {
 #define EGL_EGL_PROTOTYPES 1
 #endif
 
-/* Generated on date 20211116 */
+/* Generated on date 20220105 */
 
 /* Generated C header for:
  * API: egl
diff --git a/api/EGL/eglext.h b/api/EGL/eglext.h
index 6d4e735..14e6902 100644
--- a/api/EGL/eglext.h
+++ b/api/EGL/eglext.h
@@ -14,12 +14,12 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.khronos.org/registry/egl
 **
-** Khronos $Git commit SHA1: 8c62b915dd $ on $Git commit date: 2021-11-05 23:32:01 -0400 $
+** Khronos $Git commit SHA1: 76c9410321 $ on $Git commit date: 2022-01-04 20:51:44 +0800 $
 */
 
 #include <EGL/eglplatform.h>
 
-#define EGL_EGLEXT_VERSION 20211116
+#define EGL_EGLEXT_VERSION 20220105
 
 /* Generated C header for:
  * API: egl
@@ -276,6 +276,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSetDamageRegionKHR (EGLDisplay dpy, EGLSurface
 #define EGL_PLATFORM_GBM_KHR              0x31D7
 #endif /* EGL_KHR_platform_gbm */
 
+#ifndef EGL_KHR_platform_ohos
+#define EGL_KHR_platform_ohos 1
+#define EGL_PLATFORM_OHOS_KHR             0x34E0
+#endif /* EGL_KHR_platform_ohos */
+
 #ifndef EGL_KHR_platform_wayland
 #define EGL_KHR_platform_wayland 1
 #define EGL_PLATFORM_WAYLAND_KHR          0x31D8
@@ -1428,6 +1433,11 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void);
 #define EGL_TRIPLE_BUFFER_NV              0x3230
 #endif /* EGL_NV_triple_buffer */
 
+#ifndef EGL_OHOS_image_native_buffer
+#define EGL_OHOS_image_native_buffer 1
+#define EGL_NATIVE_BUFFER_OHOS            0x34E1
+#endif /* EGL_OHOS_image_native_buffer */
+
 #ifndef EGL_TIZEN_image_native_buffer
 #define EGL_TIZEN_image_native_buffer 1
 #define EGL_NATIVE_BUFFER_TIZEN           0x32A0
diff --git a/api/egl.xml b/api/egl.xml
index 82424d5..06bc5b4 100644
--- a/api/egl.xml
+++ b/api/egl.xml
@@ -1057,7 +1057,9 @@
     </enums>
 
     <enums namespace="EGL" start="0x34E0" end="0x34EF" vendor="Huawei" comment="Reserved for Openharmony OS (via github pull request)">
-            <unused start="0x34E0" end="0x34EF"/>
+        <enum value="0x34E0" name="EGL_PLATFORM_OHOS_KHR"/>
+        <enum value="0x34E1" name="EGL_NATIVE_BUFFER_OHOS"/>
+            <unused start="0x34E2" end="0x34EF"/>
     </enums>
 <!-- Please remember that new enumerant allocations must be obtained by
      request to the Khronos API registrar (see comments at the top of this
@@ -3514,5 +3516,15 @@
                 <enum name="EGL_DRM_RENDER_NODE_FILE_EXT"/>
             </require>
         </extension>
+        <extension name="EGL_KHR_platform_ohos" supported="egl">
+            <require>
+                <enum name="EGL_PLATFORM_OHOS_KHR"/>
+            </require>
+        </extension>
+        <extension name="EGL_OHOS_image_native_buffer" supported="egl">
+            <require>
+                <enum name="EGL_NATIVE_BUFFER_OHOS"/>
+            </require>
+        </extension>
     </extensions>
 </registry>
diff --git a/extensions/KHR/EGL_KHR_platform_ohos.txt b/extensions/KHR/EGL_KHR_platform_ohos.txt
new file mode 100644
index 0000000..b4ddf69
--- /dev/null
+++ b/extensions/KHR/EGL_KHR_platform_ohos.txt
@@ -0,0 +1,86 @@
+Name
+
+    KHR_platform_ohos
+
+Name Strings
+
+    EGL_KHR_platform_ohos
+
+Contributors
+
+    Xindong Shi
+    Zheng Li
+
+Contact
+
+    Xindong Shi, Huawei Inc. (shixindong 'at' huawei.com)
+    Zheng Li, Huawei Inc. (lizheng2 'at' huawei.com)
+
+Status
+
+    Draft
+
+Version
+
+    Version 1, Dec. 14, 2021
+
+Number
+
+    EGL Extension #149
+
+Extension Type
+
+    EGL client extension
+
+Dependencies
+
+    EGL 1.5 is required.
+
+Overview
+
+    This extension defines how to create EGL resources from native Android
+    resources using the EGL 1.5 platform functionality.
+
+New Types
+
+    None
+
+New Procedures and Functions
+
+    None
+
+New Tokens
+
+    Accepted as the <platform> argument of eglGetPlatformDisplay:
+
+        EGL_PLATFORM_OHOS_KHR                0x34E0
+
+Additions to the EGL Specification
+
+    None.
+
+New Behavior
+
+    To determine if the EGL implementation supports this extension, clients
+    should query the EGL_EXTENSIONS string of EGL_NO_DISPLAY.
+
+    To obtain an EGLDisplay for the Openharmony device, call eglGetPlatformDisplay
+    with <platform> set to EGL_PLATFORM_OHOS_KHR and with <native_display>
+    set to EGL_DEFAULT_DISPLAY.
+
+    For each EGLConfig that belongs to the Openharmony platform, the
+    EGL_NATIVE_VISUAL_ID attribute is an Openharmony window format, such as
+    PIXEL_FMT_RGBA_8888.
+
+    To obtain a rendering surface from an Openharmony surface window, call
+    eglCreatePlatformWindowSurface with a <dpy> that belongs to the Openharmony
+    platform and a <native_window> that points to a HNativeWindow.
+
+    It is not valid to call eglCreatePlatformPixmapSurface with a <dpy> that
+    belongs to the Openharmony platform. Any such call fails and generates
+    an EGL_BAD_PARAMETER error.
+
+Revision History
+
+#1 (Xindong Shi, Zheng Li, Dec. 14, 2021)
+    - Initial draft.
diff --git a/extensions/OH/EGL_OHOS_image_native_buffer.txt b/extensions/OH/EGL_OHOS_image_native_buffer.txt
new file mode 100644
index 0000000..99c8f91
--- /dev/null
+++ b/extensions/OH/EGL_OHOS_image_native_buffer.txt
@@ -0,0 +1,109 @@
+Name
+
+    OHOS_image_native_buffer
+
+Name Strings
+
+    EGL_OHOS_image_native_buffer
+
+Contributors
+
+    Xindong Shi
+    Zheng Li
+
+Contact
+
+    Xindong Shi, Huawei Inc. (shixindong 'at' huawei.com)
+    Zheng Li, Huawei Inc. (lizheng2 'at' huawei.com)
+
+Status
+
+    Complete
+
+Version
+
+    Version 1, Dec. 14, 2021
+
+Number
+
+    EGL Extension #148
+
+Dependencies
+
+    EGL 1.2 is required.
+
+    EGL_KHR_image_base is required.
+
+    This extension is written against the wording of the EGL 1.2
+    Specification.
+
+Overview
+
+    This extension enables using a Openharmony native buffer (struct
+    HNativeWindowBuffer) as an EGLImage source.
+
+New Types
+
+    None.
+
+New Procedures and Functions
+
+    None.
+
+New Tokens
+
+    Accepted by the <target> parameter of eglCreateImageKHR:
+
+    EGL_NATIVE_BUFFER_OHOS             0x34E1
+
+Changes to Chapter 3 of the EGL 1.2 Specification (EGL Functions and Errors)
+
+    Add to section 2.5.1 "EGLImage Specification" (as defined by the
+    EGL_KHR_image_base specification), in the description of
+    eglCreateImageKHR:
+
+   "Values accepted for <target> are listed in Table aaa, below.
+
+      +-------------------------+---------------------------------------------------+
+      | <target>                | Notes                                             |
+      +-------------------------+---------------------------------------------------+
+      | EGL_NATIVE_BUFFER_OHOS  | Used for Openharmony HNativeWindowBuffer objects  |
+      +-------------------------+---------------------------------------------------+
+       Table aaa.  Legal values for eglCreateImageKHR <target> parameter
+
+    ...
+
+    If <target> is EGL_NATIVE_BUFFER_OHOS, <dpy> must be a valid display,
+    <ctx> must be EGL_NO_CONTEXT, <buffer> must be a pointer to a valid
+    HNativeWindowBuffer object (cast into the type EGLClientBuffer), and
+    attributes other than EGL_IMAGE_PRESERVED_KHR are ignored."
+
+    Add to the list of error conditions for eglCreateImageKHR:
+
+      "* If <target> is EGL_NATIVE_BUFFER_OHOS and <buffer> is not a
+         pointer to a valid HNativeWindowBuffer, the error EGL_BAD_PARAMETER
+         is generated.
+
+       * If <target> is EGL_NATIVE_BUFFER_OHOS and <ctx> is not
+         EGL_NO_CONTEXT, the error EGL_BAD_CONTEXT is generated.
+
+       * If <target> is EGL_NATIVE_BUFFER_OHOS and <buffer> was created
+         with properties (format, usage, dimensions, etc.) not supported by
+         the EGL implementation, the error EGL_BAD_PARAMETER is generated."
+
+Issues
+
+    1. Should this extension define what combinations of HNativeWindowBuffer
+    properties implementations are required to support?
+
+    RESOLVED: No.
+
+    The requirements have evolved over time and will continue to change with
+    future Openharmony releases. The minimum requirements for a given Openharmony
+    version should be documented by that version.
+
+
+Revision History
+
+#1 (Xindong Shi, Zheng Li, Dec. 14, 2021)
+    - Initial draft.
diff --git a/index.php b/index.php
index c5522f5..2a45ba5 100644
--- a/index.php
+++ b/index.php
@@ -361,6 +361,10 @@ include_once("../../assets/static_pages/khr_page_top.php");
 </li>
 <li value=147> <a href="extensions/EXT/EGL_EXT_surface_compression.txt">EGL_EXT_surface_compression</a>
 </li>
+<li value=148> <a href="extensions/OH/EGL_OHOS_image_native_buffer.txt">EGL_OHOS_image_native_buffer</a>
+</li>
+<li value=149> <a href="extensions/KHR/EGL_KHR_platform_ohos.txt">EGL_KHR_platform_ohos</a>
+</li>
 </ol>
 
 <h6> Providing Feedback on the Registry </h6>
diff --git a/registry.tcl b/registry.tcl
index f170b90..34d51de 100644
--- a/registry.tcl
+++ b/registry.tcl
@@ -762,4 +762,14 @@ extension EGL_EXT_surface_compression {
     flags       public
     filename    extensions/EXT/EGL_EXT_surface_compression.txt
 }
-# Next free extension number: 148
+extension EGL_OHOS_image_native_buffer {
+    number      148
+    flags       public
+    filename    extensions/OH/EGL_OHOS_image_native_buffer.txt
+}
+extension EGL_KHR_platform_ohos {
+    number      149
+    flags       public
+    filename    extensions/KHR/EGL_KHR_platform_ohos.txt
+}
+# Next free extension number: 150
-- 
Gitee