Merge pull request #275 from bclack/EXT_texture_shadow_lod
Adding EXT_texture_shadow_lod
diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index b80c617..b43ac30 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h
@@ -4662,6 +4662,10 @@
#define GL_SKIP_DECODE_EXT 0x8A4A
#endif /* GL_EXT_texture_sRGB_decode */
+#ifndef GL_EXT_texture_shadow_lod
+#define GL_EXT_texture_shadow_lod 1
+#endif /* GL_EXT_texture_shadow_lod */
+
#ifndef GL_EXT_window_rectangles
#define GL_EXT_window_rectangles 1
#define GL_INCLUSIVE_EXT 0x8F10
diff --git a/api/GL/glext.h b/api/GL/glext.h
index 04ac760..d72cc75 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20190515
+#define GL_GLEXT_VERSION 20190524
#include <KHR/khrplatform.h>
@@ -8536,6 +8536,10 @@
#define GL_SKIP_DECODE_EXT 0x8A4A
#endif /* GL_EXT_texture_sRGB_decode */
+#ifndef GL_EXT_texture_shadow_lod
+#define GL_EXT_texture_shadow_lod 1
+#endif /* GL_EXT_texture_shadow_lod */
+
#ifndef GL_EXT_texture_shared_exponent
#define GL_EXT_texture_shared_exponent 1
#define GL_RGB9_E5_EXT 0x8C3D
diff --git a/api/GL/glxext.h b/api/GL/glxext.h
index dc007b5..f250ccc 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 20190515
+#define GLX_GLXEXT_VERSION 20190524
/* Generated C header for:
* API: glx
diff --git a/api/GL/wgl.h b/api/GL/wgl.h
index f97f418..46d1881 100644
--- a/api/GL/wgl.h
+++ b/api/GL/wgl.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-/* Generated on date 20190515 */
+/* Generated on date 20190524 */
/* Generated C header for:
* API: wgl
diff --git a/api/GL/wglext.h b/api/GL/wglext.h
index 515e7c4..5c858df 100755
--- a/api/GL/wglext.h
+++ b/api/GL/wglext.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-#define WGL_WGLEXT_VERSION 20190515
+#define WGL_WGLEXT_VERSION 20190524
/* Generated C header for:
* API: wgl
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index 6b804c0..0d9022d 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@
#include <GLES/glplatform.h>
-/* Generated on date 20190515 */
+/* Generated on date 20190524 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 78c7622..808daad 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20190515 */
+/* Generated on date 20190524 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index 5a31db0..7407957 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20190515 */
+/* Generated on date 20190524 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index aaf3bb4..7305a16 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20190515 */
+/* Generated on date 20190524 */
/* Generated C header for:
* API: gles2
@@ -2200,6 +2200,10 @@
#define GL_SKIP_DECODE_EXT 0x8A4A
#endif /* GL_EXT_texture_sRGB_decode */
+#ifndef GL_EXT_texture_shadow_lod
+#define GL_EXT_texture_shadow_lod 1
+#endif /* GL_EXT_texture_shadow_lod */
+
#ifndef GL_EXT_texture_storage
#define GL_EXT_texture_storage 1
#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index c5ca81a..70b33a7 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20190515 */
+/* Generated on date 20190524 */
/* Generated C header for:
* API: gles2
diff --git a/extensions/EXT/EXT_texture_shadow_lod.txt b/extensions/EXT/EXT_texture_shadow_lod.txt
new file mode 100644
index 0000000..c03a3cb
--- /dev/null
+++ b/extensions/EXT/EXT_texture_shadow_lod.txt
@@ -0,0 +1,158 @@
+Name
+
+ EXT_texture_shadow_lod
+
+Name Strings
+
+ GL_EXT_texture_shadow_lod
+
+Contact
+
+ Billy Clack, NVIDIA Corporation (bclack 'at' nvidia.com)
+
+Contributors
+
+ Ashwin Lele, NVIDIA Corporation
+ Daniel Koch, NVIDIA Corporation
+ Graeme Leese, Broadcom Corporation
+ Pyarelal Knowles, NVIDIA Corporation
+ Sugar Ghuge, Intel Corporation
+ Mark Janes, Intel Corporation
+
+Status
+
+ Complete.
+
+Version
+
+ Last Modified Date: May 24, 2019
+ Revision: 1
+
+Number
+
+ OpenGL Extension #539
+ OpenGL ES Extension #320
+
+Dependencies
+
+ OpenGL 2.0 or OpenGL ES 3.0 is required.
+
+ This extension is written against the OpenGL Shading Language
+ Specification, version 4.60.5 dated July 14, 2018.
+
+ The same shading language modifications should also be applied to the
+ OpenGL ES Shading Language Specification, version 3.20.4 under the
+ corresponding sections.
+
+ This extension interacts with ARB_texture_cube_map_array and OpenGL 4.0.
+
+ This extension interacts with OES_texture_cube_map_array and OpenGL ES 3.2.
+
+ This extension interacts with EXT_texture_cube_map_array and OpenGL ES 3.2.
+
+ This extension requires EXT_gpu_shader4 or equivalent functionality.
+
+Overview
+
+ This extension adds support for various shadow sampler types with texture
+ functions having interactions with the LOD of texture lookups. Modern
+ shading languages support LOD queries for shadow sampler types, but until
+ now the OpenGL Shading Language Specification has excluded multiple texture
+ function overloads involving LOD calculations with various shadow samplers.
+ Shading languages for other APIs do support the equivalent LOD-based
+ texture sampling functions for these types which has made porting between
+ those shading languages to GLSL cumbersome and has required the usage of
+ sub-optimal workarounds.
+
+New Procedures and Functions
+
+ None
+
+New Tokens
+
+ None
+
+Modification to the OpenGL Shading Language Specification, Version 4.60.5
+
+ Including the following line in a shader can be used to control
+ the language features described in this extension:
+
+ #extension GL_EXT_texture_shadow_lod : <behavior>
+
+ where <behavior> is specified in section 3.3.
+
+ New preprocessor #defines are added to the OpenGL Shading Language:
+
+ #define GL_EXT_texture_shadow_lod 1
+
+
+ Add to section 8.9.2 "Texel Lookup Functions" (p. 170):
+
+ (Add variants of the texture lookup functions with supplied bias p. 170)
+
+ float texture(sampler2DArrayShadow sampler, vec4 P [, float bias])
+ float texture(samplerCubeArrayShadow sampler, vec4 P, float compare [, float bias])
+
+
+ (Add variant of the texture lookup function with supplied offset and optional supplied bias p. 170)
+
+ float textureOffset(sampler2DArrayShadow sampler, vec4 P, ivec2 offset [, float bias])
+
+
+ (Add new functions to the set of allowed texture LOD lookup functions p. 170)
+
+ float textureLod(sampler2DArrayShadow sampler, vec4 P, float lod)
+ float textureLod(samplerCubeShadow sampler, vec4 P, float lod)
+ float textureLod(samplerCubeArrayShadow sampler, vec4 P, float compare, float lod)
+ float textureLodOffset(sampler2DArrayShadow sampler, vec4 P, float lod, ivec2 offset)
+
+Dependencies on ARB_texture_cube_map_array and OpenGL 4.0
+
+ If neither ARB_texture_cube_map_array nor OpenGL 4.0 are supported for
+ OpenGL contexts, ignore references to samplerCubeArrayShadow.
+
+Dependencies on OES_texture_cube_map_array, EXT_texture_cube_map_array and OpenGL ES 3.2
+
+ If neither OES_texture_cube_map_array, EXT_texture_cube_map_array, nor OpenGL ES 3.2 are supported for
+ OpenGL ES contexts, ignore references to samplerCubeArrayShadow.
+
+Issues
+
+ (1) Are there any other texture function and sampler combinations that are
+ missing from the specifications that might be valid combinations?
+
+ RESOLVED: Yes, as of GLSL 4.60.5 and ESSL 3.20.4, there are other
+ missing texture functions and sampler combinations that might be valid
+ but this extension does not add support for.
+
+ There is no support for Cube samplers and textureOffset family of
+ functions, and no support for Array samplers with textureProj family
+ of functions. This extension does not add support for these functions
+ since they are 1) not related to shadow samplers and thus outside the
+ scope of this extension, 2) not yet clear if these combinations should
+ be supported at all, and 3) if support should be added then each
+ family of missing functions is deserving of its own extension.
+
+ textureGrad() is missing support for samplerCubeArrayShadow in both
+ the GLSL and ESSL specifications, and is also missing support for
+ gsampler2DArray variants only in the ESSL specification. The
+ samplerCubeArrayShadow variant is not included in this extension
+ because not all vendors can easily support the additional parameter
+ beyond the gradients. The missing gsampler2DArray variants in ESSL
+ are not added because they are unrelated to shadow types and thus
+ outside the scope of this extension.
+
+ (2) The GLSL specification already contains a definition for
+ textureOffset() with sampler2DArrayShadow; does this mean only the optional
+ bias variant of this function is needed?
+
+ RESOLVED: Yes for GLSL, but the ESSL specification does
+ not have either the non-bias or bias variants of this function so both
+ variants should be defined according to this extension.
+
+Revision History
+
+ Revision 1
+ - Initial version.
+
+
diff --git a/extensions/esext.php b/extensions/esext.php
index 8125906..b61932d 100644
--- a/extensions/esext.php
+++ b/extensions/esext.php
@@ -663,4 +663,6 @@
</li>
<li value=319><a href="extensions/EXT/EXT_multiview_tessellation_geometry_shader.txt">GL_EXT_multiview_tessellation_geometry_shader</a>
</li>
+<li value=320><a href="extensions/EXT/EXT_texture_shadow_lod.txt">GL_EXT_texture_shadow_lod</a>
+</li>
</ol>
diff --git a/extensions/glext.php b/extensions/glext.php
index dabce62..2fa2314 100644
--- a/extensions/glext.php
+++ b/extensions/glext.php
@@ -1015,4 +1015,6 @@
</li>
<li value=538><a href="extensions/EXT/EXT_multiview_tessellation_geometry_shader.txt">GL_EXT_multiview_tessellation_geometry_shader</a>
</li>
+<li value=539><a href="extensions/EXT/EXT_texture_shadow_lod.txt">GL_EXT_texture_shadow_lod</a>
+</li>
</ol>
diff --git a/extensions/registry.py b/extensions/registry.py
index 2aeb4ec..8b6b229 100644
--- a/extensions/registry.py
+++ b/extensions/registry.py
@@ -2550,6 +2550,13 @@
'supporters' : { 'APPLE', 'CodeWeavers', 'NVIDIA', 'TransGaming' },
'url' : 'extensions/EXT/EXT_texture_sRGB_decode.txt',
},
+ 'GL_EXT_texture_shadow_lod' : {
+ 'number' : 539,
+ 'esnumber' : 320,
+ 'flags' : { 'public' },
+ 'supporters' : { 'NVIDIA' },
+ 'url' : 'extensions/EXT/EXT_texture_shadow_lod.txt',
+ },
'GL_EXT_texture_shared_exponent' : {
'number' : 333,
'flags' : { 'public' },
diff --git a/xml/gl.xml b/xml/gl.xml
index 5e032d5..ce4ba10 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -50574,5 +50574,6 @@
<enum name="GL_FOG_SPECULAR_TEXTURE_WIN"/>
</require>
</extension>
+ <extension name="GL_EXT_texture_shadow_lod" supported="gl|glcore|gles2"/>
</extensions>
</registry>
