Merge pull request #230 from dgkoch/dgkoch_tsr8
Register EXT_texture_sRGB_R8 for GL
diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index 33b01e2..a95bbb8 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h
@@ -4638,6 +4638,11 @@
#define GL_WEIGHTED_AVERAGE_EXT 0x9367
#endif /* GL_EXT_texture_filter_minmax */
+#ifndef GL_EXT_texture_sRGB_R8
+#define GL_EXT_texture_sRGB_R8 1
+#define GL_SR8_EXT 0x8FBD
+#endif /* GL_EXT_texture_sRGB_R8 */
+
#ifndef GL_EXT_texture_sRGB_decode
#define GL_EXT_texture_sRGB_decode 1
#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48
diff --git a/api/GL/glext.h b/api/GL/glext.h
index c452a05..39267fe 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20181031
+#define GL_GLEXT_VERSION 20181130
#include <KHR/khrplatform.h>
@@ -8512,6 +8512,11 @@
#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
#endif /* GL_EXT_texture_sRGB */
+#ifndef GL_EXT_texture_sRGB_R8
+#define GL_EXT_texture_sRGB_R8 1
+#define GL_SR8_EXT 0x8FBD
+#endif /* GL_EXT_texture_sRGB_R8 */
+
#ifndef GL_EXT_texture_sRGB_decode
#define GL_EXT_texture_sRGB_decode 1
#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48
diff --git a/api/GL/glxext.h b/api/GL/glxext.h
index 966409b..8835b66 100755
--- a/api/GL/glxext.h
+++ b/api/GL/glxext.h
@@ -34,7 +34,7 @@
** https://github.com/KhronosGroup/OpenGL-Registry
*/
-#define GLX_GLXEXT_VERSION 20181031
+#define GLX_GLXEXT_VERSION 20181130
/* Generated C header for:
* API: glx
diff --git a/api/GL/wgl.h b/api/GL/wgl.h
index 3d0c92b..3391185 100644
--- a/api/GL/wgl.h
+++ b/api/GL/wgl.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-/* Generated on date 20181031 */
+/* Generated on date 20181130 */
/* Generated C header for:
* API: wgl
diff --git a/api/GL/wglext.h b/api/GL/wglext.h
index 48e4de2..a9a5a5b 100755
--- a/api/GL/wglext.h
+++ b/api/GL/wglext.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-#define WGL_WGLEXT_VERSION 20181031
+#define WGL_WGLEXT_VERSION 20181130
/* Generated C header for:
* API: wgl
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index e3303b6..0d49769 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@
#include <GLES/glplatform.h>
-/* Generated on date 20181031 */
+/* Generated on date 20181130 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 040bba6..41de807 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20181031 */
+/* Generated on date 20181130 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index 996fcd5..cf3b7f3 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20181031 */
+/* Generated on date 20181130 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index 4f3bcfb..81d712e 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20181109 */
+/* Generated on date 20181130 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index 6b3f320..4570785 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20181031 */
+/* Generated on date 20181130 */
/* Generated C header for:
* API: gles2
diff --git a/extensions/EXT/EXT_texture_sRGB_R8.txt b/extensions/EXT/EXT_texture_sRGB_R8.txt
index da5eb71..50f886e 100644
--- a/extensions/EXT/EXT_texture_sRGB_R8.txt
+++ b/extensions/EXT/EXT_texture_sRGB_R8.txt
@@ -13,6 +13,7 @@
Daniel Koch
Tobias Hector
Jan-Harald Fredriksen
+ Sourav Parmar
Contact
@@ -24,18 +25,28 @@
Version
- Last Modified Date: January 28, 2015
- Revision: #4.0
+ Last Modified Date: November 30, 2018
+ Revision: 5
Number
OpenGL ES Extension #221
+ OpenGL Extension #594
Dependencies
- OpenGL ES 3.0 is required.
+ OpenGL ES 3.0 or OpenGL 1.2 is required.
- This extension is written against the OpenGL ES 3.1 specification.
+ This extension is written against the OpenGL ES 3.1 and
+ OpenGL 4.6 (Core Profile) specifications.
+
+ This extension interacts with ARB_texture_view.
+
+ This extension interacts with EXT_texture_view.
+
+ This extension interacts with OES_texture_view.
+
+ This extension interacts with ARB_direct_state_access.
Overview
@@ -49,13 +60,14 @@
New Tokens
- Accepted by the <internalformat> parameters of TexImage2D, TexImage3D,
- TexStorage2D and TexStorage3D:
+ Accepted by the <internalformat> parameters of TexImage3D, TexImage2D,
+ TexImage1D, TexStorage3D, TexStorage2D, TexStorage1D, TextureStorage3D,
+ TextureStorage2D, and TextureStorage1D:
SR8_EXT 0x8FBD
-Additions to Chapter 8 of the OpenGL ES 3.1 Specification (Textures and
-Samplers)
+Additions to Chapter 8 of the OpenGL ES 3.1 Specification [GL 4.6 core
+specification] (Textures and Samplers)
The following table entry is added to Table 8.2 (Valid combinations of
format, type and sized internalformat):
@@ -64,20 +76,53 @@
------ ---- ------------------------ ---------------
RED UNSIGNED_BYTE 1 SR8_EXT
- The following table entry is added to Table 8.13 (Correspondence of sized
- internal color formats to base internal formats):
+ The following table entry is added to Table 8.13 [8.12 in the GL 4.6 core
+ profile] (Correspondence of sized internal color formats to base internal
+ formats):
Sized Internal Format Base Internal Format R G B A S CR TF Req. rend. Req. tex.
--------------------- -------------------- - - - - - -- -- ---------- ---------
SR8_EXT RED 8 X X
- The following table entry is added to Table 8.24 (sRGB texture internal
- formats):
+ The following table entry is added to Table 8.22 in the GL 4.6 core profile
+ (Compatible internal formats for TextureView):
+
+ Class Internal formats
+ --------------- ----------------
+ VIEW_CLASS_8_BITS SR8_EXT
+
+ The following table entry is added to Table 8.24 [8.24 in the GL 4.6 core
+ profile] (sRGB texture internal formats):
Internal Format
---------------
SR8_EXT
+Dependencies on OpenGL
+
+ If OpenGL is not supported, ignore all references to 1D textures,
+ including TexImage1D, TexStorage1D, and TextureStorage1D.
+
+Dependencies on OpenGL 4.5 and ARB_direct_state_access
+
+ If neither OpenGL 4.5 nor ARB_direct_state_access are supported,
+ ignore all references to TextureStorage3D, TextureStorage2D, and
+ TextureStorage1D.
+
+Dependencies on ARB_texture_view
+
+ If ARB_texture_view is supported, add SR8_EXT to the Internal formats
+ column of the VIEW_CLASS_8_BITS row in Table 3.X.2.
+
+Dependencies on EXT_texture_view
+
+ If EXT_texture_view is supported, add SR8_EXT to the Internal formats
+ column of the VIEW_CLASS_8_BITS row in Table 8.X.2.
+
+Dependencies on OES_texture_view
+
+ If OES_texture_view is supported, add SR8_EXT to the Internal formats
+ column of the VIEW_CLASS_8_BITS row in Table 8.X.2.
Errors
@@ -89,7 +134,11 @@
Revision History
- #01 1/9/2015 Sam Holmes Initial revision.
- #02 1/21/2015 Maurice Ribble Cleanup minor issues
- #03 1/22/2015 Tobias Hector Removed "GL_" prefix and somewhat confusing version language.
- #04 1/28/2015 Sam Holmes Remove redundant specification of errors and clean up internal format name.
+
+ Rev Date Author Description
+ ---- ---------- -------------- ---------------------------------
+ 1 1/9/2015 Sam Holmes Initial revision.
+ 2 1/21/2015 Maurice Ribble Cleanup minor issues
+ 3 1/22/2015 Tobias Hector Removed "GL_" prefix and somewhat confusing version language.
+ 4 1/28/2015 Sam Holmes Remove redundant specification of errors and clean up internal format name.
+ 5 11/30/2018 Sourav Parmar Add GL interactions and register for GL.
diff --git a/extensions/esext.php b/extensions/esext.php
index 3b718da..e4967a9 100644
--- a/extensions/esext.php
+++ b/extensions/esext.php
@@ -639,4 +639,6 @@
</li>
<li value=307><a href="extensions/QCOM/QCOM_YUV_texture_gather.txt">GL_QCOM_YUV_texture_gather</a>
</li>
+<li value=308><a href="extensions/NV/NV_compute_shader_derivatives.txt">GL_NV_compute_shader_derivatives</a>
+</li>
</ol>
diff --git a/extensions/glext.php b/extensions/glext.php
index 56fcdc8..aab9187 100644
--- a/extensions/glext.php
+++ b/extensions/glext.php
@@ -1005,4 +1005,6 @@
</li>
<li value=593><a href="extensions/NV/NV_vdpau_interop2.txt">GL_NV_vdpau_interop2</a>
</li>
+<li value=594><a href="extensions/EXT/EXT_texture_sRGB_R8.txt">GL_EXT_texture_sRGB_R8</a>
+</li>
</ol>
diff --git a/extensions/registry.py b/extensions/registry.py
index 1d0fb8b..5fd7989 100644
--- a/extensions/registry.py
+++ b/extensions/registry.py
@@ -2496,6 +2496,7 @@
'url' : 'extensions/EXT/EXT_texture_sRGB.txt',
},
'GL_EXT_texture_sRGB_R8' : {
+ 'number' : 594,
'esnumber' : 221,
'flags' : { 'public' },
'url' : 'extensions/EXT/EXT_texture_sRGB_R8.txt',
diff --git a/xml/gl.xml b/xml/gl.xml
index 3b7805e..192a9e9 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -45200,7 +45200,7 @@
<enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/>
</require>
</extension>
- <extension name="GL_EXT_texture_sRGB_R8" supported="gles2">
+ <extension name="GL_EXT_texture_sRGB_R8" supported="gles2|gl|glcore">
<require>
<enum name="GL_SR8_EXT"/>
</require>
