Merge branch 'KhronosGroup:main' into grammar

Author: dj2

.gitignore

@@ -0,0 +1 @@
+out

README.adoc

@@ -84,3 +84,8 @@ that do not live in the Khronos registries for OpenGL or OpenGL ES.
 - link:{repo}/nv/GLSL_NV_displacement_micromap.txt[GL_NV_displacement_micromap]
 - link:{repo}/ext/GL_EXT_maximal_reconvergence.txt[GL_EXT_maximal_reconvergence]
 - link:{repo}/ext/GLSL_EXT_spec_constant_composites.txt[GL_EXT_spec_constant_composites]
+- link:{repo}/ext/GLSL_EXT_shader_atomic_float2.txt[GLSL_EXT_shader_atomic_float2]
+- link:{repo}/ext/GLSL_EXT_shader_tile_image.txt[GLSL_EXT_shader_tile_image]
+- link:{repo}/ext/GLSL_EXT_spirv_intrinsics.txt[GLSL_EXT_spirv_intrinsics]
+- link:{repo}/ext/GL_EXT_control_flow_attributes2.txt[GL_EXT_control_flow_attributes2]
+- link:{repo}/ext/GL_EXT_shader_atomic_int64.txt[GL_EXT_shader_atomic_int64]

chapters/builtinfunctions.adoc

@@ -349,7 +349,7 @@ endif::GLSL[]
   genIType *min*(genIType _x_, int _y_) +
   genUType *min*(genUType _x_, genUType _y_) +
   genUType *min*(genUType _x_, uint _y_)
-    | Returns _y_ if _y_ < _x;_ otherwise it returns _x_.
+    | Returns _y_ if _y_ < _x;_ otherwise it returns _x_. Which operand is the result is undefined if one of the operands is a NaN.
 | genFType *max*(genFType _x_, genFType _y_) +
   genFType *max*(genFType _x_, float _y_) +
 ifdef::GLSL[]
@@ -360,7 +360,7 @@ endif::GLSL[]
   genIType *max*(genIType _x_, int _y_) +
   genUType *max*(genUType _x_, genUType _y_) +
   genUType *max*(genUType _x_, uint _y_)
-    | Returns _y_ if _x_ < _y;_ otherwise it returns _x_.
+    | Returns _y_ if _x_ < _y;_ otherwise it returns _x_. Which operand is the result is undefined if one of the operands is a NaN.
 | genFType *clamp*(genFType _x_, genFType _minVal_, genFType _maxVal_) +
   genFType *clamp*(genFType _x_, float _minVal_, float _maxVal_) +
 ifdef::GLSL[]
@@ -988,7 +988,7 @@ Such properties are taken into account as the texture is accessed via the
 built-in functions defined below.
 
 Texture data can be stored by the GL as single-precision floating-point,
-unsigned normalized integer, unsigned integer or signed integer data.
+normalized integer, unsigned integer or signed integer data.
 This is determined by the type of the internal format of the texture.
 
 Texture lookup functions are provided that can return their result as
@@ -1455,7 +1455,7 @@ endif::GLSL[]
       See *textureProj*, *textureLod*, and *textureOffset*.
 |
 ifdef::GLSL[]
-  gvec4 *textureGrad*(gsampler1D _sampler_, _float _P_, float _dPdx_, float _dPdy_) +
+  gvec4 *textureGrad*(gsampler1D _sampler_, float _P_, float _dPdx_, float _dPdy_) +
 endif::GLSL[]
   gvec4 *textureGrad*(gsampler2D _sampler_, vec2 _P_, vec2 _dPdx_, vec2 _dPdy_) +
   gvec4 *textureGrad*(gsampler3D _sampler_, vec3 _P_, vec3 _dPdx_, vec3 _dPdy_) +

chapters/grammar.adoc

@@ -637,7 +637,7 @@ _switch_statement_ : ::
     _RIGHT_BRACE_
 
 _switch_statement_list_ : ::
-    /* _nothing_ */ +
+    /* _empty_ */ +
     _statement_list_
 
 _case_label_ : ::
@@ -656,8 +656,8 @@ _for_init_statement_ : ::
     _declaration_
 
 _conditionopt_ : ::
-    _condition_ +
-    /* _empty_ */
+    /* _empty_ */ +
+    _condition_
 
 _for_rest_statement_ : ::
     _conditionopt_ _SEMICOLON_ +

chapters/spirvmappings.adoc

@@ -118,7 +118,7 @@ can be made by operations on scalars:
 
     layout(constant_id = 18) const int scX = 1;
     layout(constant_id = 19) const int scZ = 1;
-    const vec3 scVec = vec3(scX, 1, scZ);  // partially specialized vector
+    const ivec3 scVec = ivec3(scX, 1, scZ);  // partially specialized vector
 
 A built-in variable can have a _constant_id_ attached to it:
 

extensions/khr/GL_KHR_vulkan_glsl.txt

@@ -179,7 +179,7 @@ Overview
 
         layout(constant_id = 18) const int scX = 1;
         layout(constant_id = 19) const int scZ = 1;
-        const vec3 scVec = vec3(scX, 1, scZ);  // partially specialized vector
+        const ivec3 scVec = ivec3(scX, 1, scZ);  // partially specialized vector
 
     A built-in variable can have a 'constant_id' attached to it: