Split primitive culling ray flags to separate extension

alelenv · dgkoch · commit 5a4a17511093 · 2020-04-03T14:31:10.000-04:00
Fixes vulkan issue #2073
glslang #2169
diff --git a/README.md b/README.md
@@ -65,3 +65,4 @@ which normatively accepts SPIR-V but does not normatively consume a high-level s
 - [GL_EXT_debug_printf](https://github.com/KhronosGroup/GLSL/blob/master/extensions/ext/GLSL_EXT_debug_printf.txt)
 - [GL_EXT_ray_tracing](https://github.com/KhronosGroup/GLSL/blob/master/extensions/ext/GLSL_EXT_ray_tracing.txt)
 - [GL_EXT_ray_query](https://github.com/KhronosGroup/GLSL/blob/master/extensions/ext/GLSL_EXT_ray_query.txt)
+- [GL_EXT_ray_flags_primitive_culling](https://github.com/KhronosGroup/GLSL/blob/master/extensions/ext/GLSL_EXT_ray_flags_primitive_culling.txt)
diff --git a/extensions/ext/GLSL_EXT_ray_flags_primitive_culling.txt b/extensions/ext/GLSL_EXT_ray_flags_primitive_culling.txt
@@ -0,0 +1,104 @@
+Name
+
+    EXT_ray_flags_primitive_culling
+
+Name Strings
+
+    GL_EXT_ray_flags_primitive_culling
+
+Contact
+
+    Daniel Koch (dkoch 'at' nvidia.com), NVIDIA
+
+Contributors
+
+    Ashwin Lele, NVIDIA
+    Tobias Hector, AMD
+
+Status
+
+    Draft
+
+Version
+
+    Last Modified Date: 2020-04-01
+    Revision: 1
+
+Dependencies
+
+    This extension can be applied to OpenGL GLSL versions 4.60
+    (#version 460) and higher.
+
+    This extension is written against revision 5 of the OpenGL Shading Language
+    version 4.60, dated September 4, 2017.
+
+    This extension interacts with GL_EXT_ray_tracing.
+
+    This extension interacts with GL_EXT_ray_query.
+
+Overview
+
+    This extension document modifies GLSL to add additional integer constants
+    which can be used as ray flags under ray tracing or ray query extensions.
+    
+
+    This extension document adds support for the following extensions to be used
+    within GLSL:
+
+    - GL_EXT_ray_flags_primitive_culling - 
+
+    Mapping to SPIR-V
+    -----------------
+
+    For informational purposes (non-normative), the following is an
+    expected way for an implementation to map GLSL constructs to SPIR-V
+    constructs:
+
+      gl_RayFlagsSkipTrianglesEXT -> SkipTrianglesKHR ray flag
+      gl_RayFlagsSkipAABBEXT -> SkipAABBsKHR ray flag
+
+    Using this extension defines the <RayTraversalPrimitiveCullingProvisionalKHR> 
+    capability.
+
+Modifications to the OpenGL Shading Language Specification, Version 4.60
+
+    Including the following line in a shader can be used to control the
+    language features described in this extension:
+
+      #extension GL_EXT_ray_flags_primitive_culling : <behavior>
+
+    where <behavior> is as specified in section 3.3.
+    New preprocessor #defines are added:
+
+      #define GL_EXT_ray_flags_primtive_culling          1
+
+
+Additions to Chapter 7 of the OpenGL Shading Language Specification
+(Built-in Variables)
+
+    Modify Section 7.3, Built-in Constants
+
+    Add a new subsection 7.3.x, "Fixed Constants"
+
+    The following constants are provided in all shader stages when this
+    extension is enabled
+
+    const uint gl_RayFlagsSkipTrianglesEXT = 256U;
+    const uint gl_RayFlagsSkipAABBEXT = 512U;
+
+
+Interactions with GL_EXT_ray_tracing/GL_EXT_ray_query
+
+    Ray flags added by this extension can be used as flags for 'rayflags'
+    argument for  traceRayEXT()/rayQueryInitializeEXT() call or for comparing 
+    values to gl_IncomingRayFlagsEXT or the result of rayQueryGetRayFlagsEXT.
+
+Issues
+
+    TBD
+
+Revision History
+
+    Rev.  Date          Author     Changes
+    ----  -----------   ------     -------------------------------------------
+     1    2019-04-01    alele      Initial draft
diff --git a/extensions/ext/GLSL_EXT_ray_query.txt b/extensions/ext/GLSL_EXT_ray_query.txt
@@ -22,8 +22,8 @@ Status
 
 Version
 
-    Last Modified Date: 2020-03-06
-    Revision: 5
+    Last Modified Date: 2020-04-01
+    Revision: 6
 
 Dependencies
 
@@ -38,6 +38,8 @@ Dependencies
 
     This extension interacts with GLSL_EXT_ray_tracing.
 
+    This extension interacts with GLSL_EXT_ray_flags_primitive_culling.
+
 Overview
 
     This extension document modifies GLSL to add support for ray tracing
@@ -69,8 +71,6 @@ Overview
       gl_RayFlagsCullFrontFacingTrianglesEXT -> CullFrontFacingTrianglesKHR ray flag
       gl_RayFlagsCullOpaqueEXT -> CullOpaqueKHR ray flag
       gl_RayFlagsCullNoOpaqueEXT -> CullNoOpaqueKHR ray flag
-      gl_RayFlagsSkipTrianglesEXT -> SkipTrianglesKHR ray flag
-      gl_RayFlagsSkipAABBEXT -> SkipAABBsKHR ray flag
 
       gl_RayQueryCommittedIntersectionEXT -> RayQueryCommittedIntersectionKHR enum
       gl_RayQueryCandidateIntersectionEXT -> RayQueryCandidateIntersectionKHR enum
@@ -111,11 +111,6 @@ Overview
       rayQueryGetIntersectionObjectToWorldEXT -> OpRayQueryGetIntersectionObjectToWorldKHR instruction
       rayQueryGetIntersectionWorldToObjectEXT -> OpRayQueryGetIntersectionWorldToObjectKHR instruction
 
-    In addition, using this extension defines the <RayQueryProvisionalKHR>
-    capability.
-    Using the gl_RayFlagsSkipAABBEXT or gl_RayFlagsSkipTrianglesEXT flags
-    defines the <RayTraversalPrimitiveCullingProvisionalKHR> capability.
-
 Modifications to the OpenGL Shading Language Specification, Version 4.60
 
     Including the following line in a shader can be used to control the
@@ -211,8 +206,6 @@ Additions to Chapter 7 of the OpenGL Shading Language Specification
     const uint gl_RayFlagsCullFrontFacingTrianglesEXT = 32U;
     const uint gl_RayFlagsCullOpaqueEXT = 64U;
     const uint gl_RayFlagsCullNoOpaqueEXT = 128U;
-    const uint gl_RayFlagsSkipTrianglesEXT = 256U;
-    const uint gl_RayFlagsSkipAABBEXT = 512U;
 
     These can be used as flags for the 'rayflags' argument for
     traceRayEXT()/rayQueryInitializeEXT() call or for comparing values to
@@ -465,6 +458,12 @@ Interactions with GLSL_EXT_ray_tracing
     definitions, and can be enabled by either extension, for use with the
     instructions added by that extension.
 
+Interactions with GL_EXT_ray_flags_primitive_culling
+
+    If GL_EXT_ray_flags_primitive_culling is supported, ray flags added
+    by this extension can be used as flags for the 'rayflags' argument
+    for rayQueryInitializeEXT() call, or the result of rayQueryGetRayFlagsEXT.
+
 Issues
 
     TBD
@@ -478,3 +477,4 @@ Revision History
      3    2020-02-12    tobias     Updates as per vulkan issue 1989 to better represent mapping to SPIR-V
      4    2020-02-25    tobias     Added missing (and fairly important!) rayQueryGetIntersectionTEXT
      5    2020-03-06    alele      Rename RayWorld to WorldRay for some builtins (#20), fix typo (!50)
+     6    2020-04-01    alele      Remove primitive culling ray flags (vulkan issue 2073)
diff --git a/extensions/ext/GLSL_EXT_ray_tracing.txt b/extensions/ext/GLSL_EXT_ray_tracing.txt
@@ -29,8 +29,8 @@ Status
 
 Version
 
-    Last Modified Date: 2020-02-22
-    Revision: 10
+    Last Modified Date: 2020-04-01
+    Revision: 11
 
 Dependencies
 
@@ -61,6 +61,8 @@ Dependencies
 
     This extension interacts with GL_EXT_nonuniform_qualifier.
 
+    This extension interacts with GL_EXT_ray_flags_primitive_culling.
+
 Overview
 
     This extension document modifies GLSL to add new shader stages to support ray tracing.
@@ -125,8 +127,6 @@ Overview
       gl_RayFlagsCullFrontFacingTrianglesEXT -> CullFrontFacingTrianglesKHR ray flag
       gl_RayFlagsCullOpaqueEXT -> CullOpaqueKHR ray flag
       gl_RayFlagsCullNoOpaqueEXT -> CullNoOpaqueKHR ray flag
-      gl_RayFlagsSkipTrianglesEXT -> SkipTrianglesKHR ray flag
-      gl_RayFlagsSkipAABBEXT -> SkipAABBsKHR ray flag
 
       gl_HitKindFrontFacingTriangleEXT -> HitKindFrontFacingTriangleKHR hit kind
       gl_HitKindBackFacingTriangleEXT -> HitKindBackFacingTriangleKHR hit kind
@@ -139,10 +139,6 @@ Overview
 
       shadercallcoherent -> NonPrivate{Pointer,Texel}KHR + Make{Pointer,Texel}{Available,Visible}KHR with scope = ShaderCallKHR
 
-    In addition, using this extension defines the <RayTracingProvisionalKHR>
-    capability.
-    Using the gl_RayFlagsSkipAABBEXT or gl_RayFlagsSkipTrianglesEXT flags
-    defines the <RayTraversalPrimitiveCullingProvisionalKHR> capability.
 
 Modifications to the OpenGL Shading Language Specification, Version 4.60
 
@@ -740,8 +736,6 @@ Additions to Chapter 7 of the OpenGL Shading Language Specification
     const uint gl_RayFlagsCullFrontFacingTrianglesEXT = 32U;
     const uint gl_RayFlagsCullOpaqueEXT = 64U;
     const uint gl_RayFlagsCullNoOpaqueEXT = 128U;
-    const uint gl_RayFlagsSkipTrianglesEXT = 256U;
-    const uint gl_RayFlagsSkipAABBEXT = 512U;
 
     These can be used as flags for the 'rayflags' argument for traceRayEXT() call,
     or for comparing value to gl_IncomingRayFlagsEXT.
@@ -1041,6 +1035,12 @@ Interactions with GL_EXT_nonuniform_qualifier
     accelerationStructureEXT can be indexed with non-unform integral
     expressions when they are decorated with the nonuniformEXT qualifier.
 
+Interactions with GL_EXT_ray_flags_primitive_culling
+
+    If GL_EXT_ray_flags_primitive_culling is supported, ray flags added
+    by this extension can be used as flags for the 'rayflags' argument
+    for traceRayEXT() call, or for comparing value to gl_IncomingRayFlagsEXT.
+
 Issues
 
     1) Do we need to specify the GL_EXT_ray_tracing as enabled for these new
@@ -1123,3 +1123,4 @@ Revision History
      8    2020-02-20    ewerness   Miss shaders do not have gl_ObjectRay* parameters (GLSL #18)
      9    2020-02-21    tobias     Clarified interactions with GLSL_EXT_ray_query
     10    2020-02-22    tobias     gl_HitTEXT now maps to RayTmaxKHR
+    11    2020-04-01    alele      Remove primitive culling ray flags (vulkan issue 2073)
