Merge pull request #32 from jdashg/nv-consumer-const
Const-qualify attrib_list in eglStreamConsumerGLTextureExternalAttrib…
diff --git a/api/EGL/egl.h b/api/EGL/egl.h
index 811ccb1..4d62afb 100644
--- a/api/EGL/egl.h
+++ b/api/EGL/egl.h
@@ -33,7 +33,7 @@
** used to make the header, and the header can be found at
** http://www.khronos.org/registry/egl
**
-** Khronos $Git commit SHA1: dd53e77d03 $ on $Git commit date: 2017-11-22 17:10:59 -0800 $
+** Khronos $Git commit SHA1: ef6d9369d0 $ on $Git commit date: 2017-11-22 13:48:57 -0800 $
*/
#include <EGL/eglplatform.h>
diff --git a/api/EGL/eglext.h b/api/EGL/eglext.h
index 3df2dd9..86f1753 100644
--- a/api/EGL/eglext.h
+++ b/api/EGL/eglext.h
@@ -33,7 +33,7 @@
** used to make the header, and the header can be found at
** http://www.khronos.org/registry/egl
**
-** Khronos $Git commit SHA1: dd53e77d03 $ on $Git commit date: 2017-11-22 17:10:59 -0800 $
+** Khronos $Git commit SHA1: ef6d9369d0 $ on $Git commit date: 2017-11-22 13:48:57 -0800 $
*/
#include <EGL/eglplatform.h>
@@ -1099,9 +1099,9 @@
#define EGL_YUV_PLANE0_TEXTURE_UNIT_NV 0x332C
#define EGL_YUV_PLANE1_TEXTURE_UNIT_NV 0x332D
#define EGL_YUV_PLANE2_TEXTURE_UNIT_NV 0x332E
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLAttrib *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
#endif
#endif /* EGL_NV_stream_consumer_gltexture_yuv */
diff --git a/api/egl.xml b/api/egl.xml
index 0157259..bf1fc59 100644
--- a/api/egl.xml
+++ b/api/egl.xml
@@ -1625,7 +1625,7 @@
<proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerGLTextureExternalAttribsNV</name></proto>
<param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
<param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
- <param><ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
+ <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
</command>
<command>
<proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerOutputEXT</name></proto>
diff --git a/extensions/NV/EGL_NV_stream_consumer_gltexture_yuv.txt b/extensions/NV/EGL_NV_stream_consumer_gltexture_yuv.txt
index 5c0e4b7..4aa0a66 100644
--- a/extensions/NV/EGL_NV_stream_consumer_gltexture_yuv.txt
+++ b/extensions/NV/EGL_NV_stream_consumer_gltexture_yuv.txt
@@ -12,6 +12,7 @@
Daniel Kartch
Nikhil Mahale
Daniel Koch
+ Jeff Gilbert
Contacts
@@ -23,7 +24,7 @@
Version
- Version 3 - August 19, 2015
+ Version 4 - November 14, 2017
Number
@@ -66,9 +67,9 @@
New Functions
EGLBoolean eglStreamConsumerGLTextureExternalAttribsNV(
- EGLDisplay dpy,
- EGLStreamKHR stream,
- EGLAttrib *attrib_list)
+ EGLDisplay dpy,
+ EGLStreamKHR stream,
+ const EGLAttrib *attrib_list)
New Tokens
@@ -98,9 +99,9 @@
Call
EGLBoolean eglStreamConsumerGLTextureExternalAttribsNV(
- EGLDisplay dpy,
- EGLStreamKHR stream,
- EGLAttrib *attrib_list)
+ EGLDisplay dpy,
+ EGLStreamKHR stream,
+ const EGLAttrib *attrib_list)
to connect one or more texture objects in the OpenGL or OpenGL ES
context current to the calling thread as the consumer(s) of
@@ -265,6 +266,9 @@
Revision History
+ #4 (November 14, 2017) Mozilla Corporation
+ - Const-qualify attrib_list.
+
#3 (August 19, 2015) NVIDIA Corporation
- Added enum values.
- Cleaned up and added contact info for publication.
