Merge pull request #452 from Perksey/patch-2
Register & add interactions for EXT_texture_sRGB_RG8
diff --git a/extensions/EXT/EXT_texture_sRGB_RG8.txt b/extensions/EXT/EXT_texture_sRGB_RG8.txt
index 35fac02..c973dba 100644
--- a/extensions/EXT/EXT_texture_sRGB_RG8.txt
+++ b/extensions/EXT/EXT_texture_sRGB_RG8.txt
@@ -12,6 +12,7 @@
Maurice Ribble
Tobias Hector
Jan-Harald Fredriksen
+ Dylan Perks
Contributors to EXT_texture_sRGB_R8, on which this is based.
Contact
@@ -24,18 +25,28 @@
Version
- Last Modified Date: February 05, 2015
- Revision: 3.0
+ Last Modified Date: December 11, 2020
+ Revision: 4
Number
OpenGL ES Extension #223
+ OpenGL Extension #555
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,8 +60,9 @@
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:
SRG8_EXT 0x8FBE
@@ -78,6 +90,62 @@
---------------
SRG8_EXT
+Additions to Chapter 8 of the OpenGL 4.6 (Core Profile) Specification
+(Textures and Samplers)
+
+ The following table entry is added to Table 8.2 (Valid combinations of
+ format, type and sized internalformat):
+
+ Format Type External Bytes per Pixel Internal Format
+ ------ ---- ------------------------ ---------------
+ RG UNSIGNED_BYTE 2 SRG8_EXT
+
+ The following table entry is added to Table 8.12 (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.
+ --------------------- -------------------- - - - - - -- -- ---------- ---------
+ SRG8_EXT RG 8 8 X X
+
+ The following table entry is added to Table 8.22 (Compatible internal
+ formats for TextureView):
+
+ Class Internal formats
+ --------------- ----------------
+ VIEW_CLASS_16_BITS SRG8_EXT
+
+ The following table entry is added to Table 8.24 (sRGB texture internal
+ formats):
+
+ Internal Format
+ ---------------
+ SRG8_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 SRG8_EXT to the Internal formats
+ column of the VIEW_CLASS_16_BITS row in Table 3.X.2.
+
+Dependencies on EXT_texture_view
+
+ If EXT_texture_view is supported, add SRG8_EXT to the Internal formats
+ column of the VIEW_CLASS_16_BITS row in Table 8.X.2.
+
+Dependencies on OES_texture_view
+
+ If OES_texture_view is supported, add SRG8_EXT to the Internal formats
+ column of the VIEW_CLASS_16_BITS row in Table 8.X.2.
Errors
@@ -92,3 +160,4 @@
#01 2/5/2015 Tobias Hector Initial revision.
#02 2/5/2015 Tobias Hector Fixed Table 8.13 entry and whitespace issues.
#03 2/17/2015 Tobias Hector Fixed Table 8.2 entry to correctly say 2 bytes.
+ #04 12/11/2020 Dylan Perks Add GL interactions and register for GL
diff --git a/extensions/registry.py b/extensions/registry.py
index 823ea02..fd7502f 100644
--- a/extensions/registry.py
+++ b/extensions/registry.py
@@ -2560,6 +2560,7 @@
'url' : 'extensions/EXT/EXT_texture_sRGB_R8.txt',
},
'GL_EXT_texture_sRGB_RG8' : {
+ 'number' : 555,
'esnumber' : 223,
'flags' : { 'public' },
'url' : 'extensions/EXT/EXT_texture_sRGB_RG8.txt',
diff --git a/xml/gl.xml b/xml/gl.xml
index 9f00b5b..1319d48 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -10375,8 +10375,8 @@
<unused start="0x8FB4" end="0x8FBA" vendor="QCOM"/>
<enum value="0x8FBB" name="GL_GPU_DISJOINT_EXT"/>
<unused start="0x8FBC" vendor="QCOM"/>
- <enum value="0x8FBD" name="GL_SR8_EXT"/>
- <enum value="0x8FBE" name="GL_SRG8_EXT"/>
+ <enum value="0x8FBD" name="GL_SR8_EXT" group="InternalFormat"/>
+ <enum value="0x8FBE" name="GL_SRG8_EXT" group="InternalFormat"/>
<enum value="0x8FBF" name="GL_TEXTURE_FORMAT_SRGB_OVERRIDE_EXT"/>
</enums>
@@ -46816,7 +46816,7 @@
<enum name="GL_SR8_EXT"/>
</require>
</extension>
- <extension name="GL_EXT_texture_sRGB_RG8" supported="gles2">
+ <extension name="GL_EXT_texture_sRGB_RG8" supported="gles2|gl|glcore">
<require>
<enum name="GL_SRG8_EXT"/>
</require>