Updated glslang.

3rdparty/glslang/.appveyor.yml

@@ -60,6 +60,7 @@ after_test:
   # Zip all glslang artifacts for uploading and deploying
   - 7z a glslang-master-windows-"%PLATFORM%"-"%CONFIGURATION%".zip
     bin\glslangValidator.exe
+    bin\spirv-remap.exe
     include\glslang\*
     include\SPIRV\*
     lib\glslang%SUFFIX%.lib

3rdparty/glslang/SPIRV/CMakeLists.txt

@@ -60,6 +60,7 @@ if(ENABLE_OPT)
         PRIVATE ${spirv-tools_SOURCE_DIR}/source
     )
     target_link_libraries(SPIRV glslang SPIRV-Tools-opt)
+    target_include_directories(SPIRV PUBLIC ../External)
 else()
     target_link_libraries(SPIRV glslang)
 endif(ENABLE_OPT)

3rdparty/glslang/SPIRV/GLSL.ext.KHR.h

@@ -36,6 +36,7 @@ static const char* const E_SPV_KHR_device_group                 = "SPV_KHR_devic
 static const char* const E_SPV_KHR_multiview                    = "SPV_KHR_multiview";
 static const char* const E_SPV_KHR_shader_draw_parameters       = "SPV_KHR_shader_draw_parameters";
 static const char* const E_SPV_KHR_16bit_storage                = "SPV_KHR_16bit_storage";
+static const char* const E_SPV_KHR_8bit_storage                 = "SPV_KHR_8bit_storage";
 static const char* const E_SPV_KHR_storage_buffer_storage_class = "SPV_KHR_storage_buffer_storage_class";
 static const char* const E_SPV_KHR_post_depth_coverage          = "SPV_KHR_post_depth_coverage";
 

3rdparty/glslang/SPIRV/GlslangToSpv.cpp

@@ -2507,6 +2507,20 @@ spv::Id TGlslangToSpvTraverser::createSpvVariable(const glslang::TIntermSymbol*
         }
     }
 
+    const bool contains8BitType = node->getType().containsBasicType(glslang::EbtInt8)   ||
+                                  node->getType().containsBasicType(glslang::EbtUint8);
+    if (contains8BitType) {
+        if (storageClass == spv::StorageClassPushConstant) {
+            builder.addExtension(spv::E_SPV_KHR_8bit_storage);
+            builder.addCapability(spv::CapabilityStoragePushConstant8);
+        } else if (storageClass == spv::StorageClassUniform) {
+            builder.addExtension(spv::E_SPV_KHR_8bit_storage);
+            builder.addCapability(spv::CapabilityUniformAndStorageBuffer8BitAccess);
+            if (node->getType().getQualifier().storage == glslang::EvqBuffer)
+                builder.addCapability(spv::CapabilityStorageBuffer8BitAccess);
+        }
+    }
+
     const char* name = node->getName().c_str();
     if (glslang::IsAnonymous(name))
         name = "";

3rdparty/glslang/SPIRV/disassemble.cpp

@@ -716,4 +716,25 @@ void Disassemble(std::ostream& out, const std::vector<unsigned int>& stream)
     SpirvStream.processInstructions();
 }
 
+#if ENABLE_OPT
+
+#include "spirv-tools/libspirv.h"
+
+// Use the SPIRV-Tools disassembler to print SPIR-V.
+void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv)
+{
+    spv_context context = spvContextCreate(SPV_ENV_UNIVERSAL_1_3);
+    spv_text text;
+    spv_diagnostic diagnostic = nullptr;
+    spvBinaryToText(context, &spirv.front(), spirv.size(),
+        SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT,
+        &text, &diagnostic);
+    if (diagnostic == nullptr)
+        out << text->str;
+    else
+        spvDiagnosticPrint(diagnostic);
+}
+
+#endif
+
 }; // end namespace spv

3rdparty/glslang/SPIRV/disassemble.h

@@ -45,8 +45,12 @@
 
 namespace spv {
 
+    // disassemble with glslang custom disassembler
     void Disassemble(std::ostream& out, const std::vector<unsigned int>&);
 
+    // disassemble with SPIRV-Tools disassembler
+    void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& stream);
+
 };  // end namespace spv
 
 #endif // disassembler_H

3rdparty/glslang/SPIRV/doc.cpp

@@ -790,6 +790,10 @@ const char* CapabilityString(int info)
     case CapabilityStoragePushConstant16:       return "StoragePushConstant16";
     case CapabilityStorageInputOutput16:        return "StorageInputOutput16";
 
+    case CapabilityStorageBuffer8BitAccess:             return "CapabilityStorageBuffer8BitAccess";
+    case CapabilityUniformAndStorageBuffer8BitAccess:   return "CapabilityUniformAndStorageBuffer8BitAccess";
+    case CapabilityStoragePushConstant8:                return "CapabilityStoragePushConstant8";
+
     case CapabilityDeviceGroup: return "DeviceGroup";
     case CapabilityMultiView:   return "MultiView";
 

3rdparty/glslang/SPIRV/spirv.hpp

@@ -679,6 +679,9 @@ enum Capability {
     CapabilityVariablePointers = 4442,
     CapabilityAtomicStorageOps = 4445,
     CapabilitySampleMaskPostDepthCoverage = 4447,
+    CapabilityStorageBuffer8BitAccess = 4448,
+    CapabilityUniformAndStorageBuffer8BitAccess = 4449,
+    CapabilityStoragePushConstant8 = 4450,
     CapabilityFloat16ImageAMD = 5008,
     CapabilityImageGatherBiasLodAMD = 5009,
     CapabilityFragmentMaskAMD = 5010,

3rdparty/glslang/StandAlone/CMakeLists.txt

@@ -33,6 +33,7 @@ endif(WIN32)
 
 target_link_libraries(glslangValidator ${LIBRARIES})
 target_link_libraries(spirv-remap ${LIBRARIES})
+target_include_directories(glslangValidator PUBLIC ../External)
 
 if(WIN32)
     source_group("Source" FILES ${SOURCES})

3rdparty/glslang/StandAlone/StandAlone.cpp

@@ -102,6 +102,7 @@ enum TOptions {
     EOptionDumpBareVersion      = (1 << 31),
 };
 bool targetHlslFunctionality1 = false;
+bool SpvToolsDisassembler = false;
 
 //
 // Return codes from main/exit().
@@ -506,6 +507,8 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
                         sourceEntryPointName = argv[1];
                         bumpArg();
                         break;
+                    } else if (lowerword == "spirv-dis") {
+                        SpvToolsDisassembler = true;
                     } else if (lowerword == "stdin") {
                         Options |= EOptionStdin;
                         shaderStageName = argv[1];
@@ -982,9 +985,15 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
                         } else {
                             glslang::OutputSpvBin(spirv, GetBinaryName((EShLanguage)stage));
                         }
-                        if (Options & EOptionHumanReadableSpv) {
+#if ENABLE_OPT
+                        if (SpvToolsDisassembler)
+                            spv::SpirvToolsDisassemble(std::cout, spirv);
+#else
+                        if (SpvToolsDisassembler)
+                            printf("SPIRV-Tools is not enabled; use -H for human readable SPIR-V\n");
+#endif
+                        if (!SpvToolsDisassembler && (Options & EOptionHumanReadableSpv))
                             spv::Disassemble(std::cout, spirv);
-                        }
                     }
                 }
             }
@@ -1405,6 +1414,8 @@ void usage()
            "  --shift-UBO-binding [stage] [num set]... per-descriptor-set shift values\n"
            "  --shift-cbuffer-binding [stage] num  synonym for --shift-UBO-binding\n"
            "  --shift-cbuffer-binding [stage] [num set]... per-descriptor-set shift values\n"
+           "  --spirv-dis                          output standard form disassembly; works only\n"
+           "                                       when a SPIR-V generation option is also used\n"
            "  --sub [stage] num                    synonym for --shift-UBO-binding\n"
            "  --source-entrypoint <name>           the given shader source function is\n"
            "                                       renamed to be the <name> given in -e\n"

3rdparty/glslang/Test/baseResults/120.frag.out

@@ -56,9 +56,8 @@ ERROR: 0:248: 'explicit types' : required extension not requested: Possible exte
 GL_AMD_gpu_shader_half_float
 GL_KHX_shader_explicit_arithmetic_types
 GL_KHX_shader_explicit_arithmetic_types_float16
-ERROR: 0:248: 'half floating-point suffix' : not supported with this profile: none
 ERROR: 0:248: '' :  syntax error, unexpected IDENTIFIER, expecting COMMA or SEMICOLON
-ERROR: 56 compilation errors.  No code generated.
+ERROR: 55 compilation errors.  No code generated.
 
 
 Shader version: 120

3rdparty/glslang/Test/baseResults/constFold.frag.out

@@ -179,6 +179,10 @@ ERROR: node is still EOpNull!
 0:83        2147483647 (const int)
 0:84      Constant:
 0:84        +1.#INF
+0:84      Constant:
+0:84        -1.#INF
+0:84      Constant:
+0:84        1.#IND
 0:88      Constant:
 0:88        2 (const uint)
 0:88        3 (const uint)

3rdparty/glslang/Test/baseResults/cppBad2.vert.out

@@ -1,7 +1,6 @@
 cppBad2.vert
 ERROR: 0:3: 'macro expansion' : End of input in macro b
-ERROR: 0:3: '' : compilation terminated 
-ERROR: 2 compilation errors.  No code generated.
+ERROR: 1 compilation errors.  No code generated.
 
 
 Shader version: 100

3rdparty/glslang/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out

@@ -1,20 +1,8 @@
 hlsl.calculatelodunclamped.dx10.frag
-ERROR: 0:28: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 0:29: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 0:30: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 0:32: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 0:33: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 0:34: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 0:36: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 0:37: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 0:38: '' : unimplemented: CalculateLevelOfDetailUnclamped 
-ERROR: 9 compilation errors.  No code generated.
-
-
 Shader version: 500
 gl_FragCoord origin is upper left
 using depth_any
-ERROR: node is still EOpNull!
+0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
 0:24    Function Parameters: 
 0:?     Sequence
@@ -29,7 +17,7 @@ ERROR: node is still EOpNull!
 0:28              Constant:
 0:28                0.100000
 0:28            Constant:
-0:28              0 (const int)
+0:28              1 (const int)
 0:29      Sequence
 0:29        move second child to first child ( temp float)
 0:29          'txval11' ( temp float)
@@ -41,7 +29,7 @@ ERROR: node is still EOpNull!
 0:29              Constant:
 0:29                0.200000
 0:29            Constant:
-0:29              0 (const int)
+0:29              1 (const int)
 0:30      Sequence
 0:30        move second child to first child ( temp float)
 0:30          'txval12' ( temp float)
@@ -53,7 +41,7 @@ ERROR: node is still EOpNull!
 0:30              Constant:
 0:30                0.300000
 0:30            Constant:
-0:30              0 (const int)
+0:30              1 (const int)
 0:32      Sequence
 0:32        move second child to first child ( temp float)
 0:32          'txval20' ( temp float)
@@ -66,7 +54,7 @@ ERROR: node is still EOpNull!
 0:?                 0.100000
 0:?                 0.200000
 0:32            Constant:
-0:32              0 (const int)
+0:32              1 (const int)
 0:33      Sequence
 0:33        move second child to first child ( temp float)
 0:33          'txval21' ( temp float)
@@ -79,7 +67,7 @@ ERROR: node is still EOpNull!
 0:?                 0.300000
 0:?                 0.400000
 0:33            Constant:
-0:33              0 (const int)
+0:33              1 (const int)
 0:34      Sequence
 0:34        move second child to first child ( temp float)
 0:34          'txval22' ( temp float)
@@ -92,7 +80,7 @@ ERROR: node is still EOpNull!
 0:?                 0.500000
 0:?                 0.600000
 0:34            Constant:
-0:34              0 (const int)
+0:34              1 (const int)
 0:36      Sequence
 0:36        move second child to first child ( temp float)
 0:36          'txval40' ( temp float)
@@ -106,7 +94,7 @@ ERROR: node is still EOpNull!
 0:?                 0.200000
 0:?                 0.300000
 0:36            Constant:
-0:36              0 (const int)
+0:36              1 (const int)
 0:37      Sequence
 0:37        move second child to first child ( temp float)
 0:37          'txval41' ( temp float)
@@ -120,7 +108,7 @@ ERROR: node is still EOpNull!
 0:?                 0.500000
 0:?                 0.600000
 0:37            Constant:
-0:37              0 (const int)
+0:37              1 (const int)
 0:38      Sequence
 0:38        move second child to first child ( temp float)
 0:38          'txval42' ( temp float)
@@ -134,7 +122,7 @@ ERROR: node is still EOpNull!
 0:?                 0.800000
 0:?                 0.900000
 0:38            Constant:
-0:38              0 (const int)
+0:38              1 (const int)
 0:40      move second child to first child ( temp 4-component vector of float)
 0:40        Color: direct index for structure ( temp 4-component vector of float)
 0:40          'psout' ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -195,7 +183,7 @@ Linked fragment stage:
 Shader version: 500
 gl_FragCoord origin is upper left
 using depth_any
-ERROR: node is still EOpNull!
+0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
 0:24    Function Parameters: 
 0:?     Sequence
@@ -210,7 +198,7 @@ ERROR: node is still EOpNull!
 0:28              Constant:
 0:28                0.100000
 0:28            Constant:
-0:28              0 (const int)
+0:28              1 (const int)
 0:29      Sequence
 0:29        move second child to first child ( temp float)
 0:29          'txval11' ( temp float)
@@ -222,7 +210,7 @@ ERROR: node is still EOpNull!
 0:29              Constant:
 0:29                0.200000
 0:29            Constant:
-0:29              0 (const int)
+0:29              1 (const int)
 0:30      Sequence
 0:30        move second child to first child ( temp float)
 0:30          'txval12' ( temp float)
@@ -234,7 +222,7 @@ ERROR: node is still EOpNull!
 0:30              Constant:
 0:30                0.300000
 0:30            Constant:
-0:30              0 (const int)
+0:30              1 (const int)
 0:32      Sequence
 0:32        move second child to first child ( temp float)
 0:32          'txval20' ( temp float)
@@ -247,7 +235,7 @@ ERROR: node is still EOpNull!
 0:?                 0.100000
 0:?                 0.200000
 0:32            Constant:
-0:32              0 (const int)
+0:32              1 (const int)
 0:33      Sequence
 0:33        move second child to first child ( temp float)
 0:33          'txval21' ( temp float)
@@ -260,7 +248,7 @@ ERROR: node is still EOpNull!
 0:?                 0.300000
 0:?                 0.400000
 0:33            Constant:
-0:33              0 (const int)
+0:33              1 (const int)
 0:34      Sequence
 0:34        move second child to first child ( temp float)
 0:34          'txval22' ( temp float)
@@ -273,7 +261,7 @@ ERROR: node is still EOpNull!
 0:?                 0.500000
 0:?                 0.600000
 0:34            Constant:
-0:34              0 (const int)
+0:34              1 (const int)
 0:36      Sequence
 0:36        move second child to first child ( temp float)
 0:36          'txval40' ( temp float)
@@ -287,7 +275,7 @@ ERROR: node is still EOpNull!
 0:?                 0.200000
 0:?                 0.300000
 0:36            Constant:
-0:36              0 (const int)
+0:36              1 (const int)
 0:37      Sequence
 0:37        move second child to first child ( temp float)
 0:37          'txval41' ( temp float)
@@ -301,7 +289,7 @@ ERROR: node is still EOpNull!
 0:?                 0.500000
 0:?                 0.600000
 0:37            Constant:
-0:37              0 (const int)
+0:37              1 (const int)
 0:38      Sequence
 0:38        move second child to first child ( temp float)
 0:38          'txval42' ( temp float)
@@ -315,7 +303,7 @@ ERROR: node is still EOpNull!
 0:?                 0.800000
 0:?                 0.900000
 0:38            Constant:
-0:38              0 (const int)
+0:38              1 (const int)
 0:40      move second child to first child ( temp 4-component vector of float)
 0:40        Color: direct index for structure ( temp 4-component vector of float)
 0:40          'psout' ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -369,4 +357,224 @@ ERROR: node is still EOpNull!
 0:?     '@entryPointOutput.Depth' ( out float FragDepth)
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-SPIR-V is not generated for failed compile or link
+// Module Version 10000
+// Generated by (magic number): 80007
+// Id's are bound by 148
+
+                              Capability Shader
+                              Capability Sampled1D
+                              Capability SampledCubeArray
+                              Capability ImageQuery
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main" 140 144
+                              ExecutionMode 4 OriginUpperLeft
+                              ExecutionMode 4 DepthReplacing
+                              Source HLSL 500
+                              Name 4  "main"
+                              Name 8  "PS_OUTPUT"
+                              MemberName 8(PS_OUTPUT) 0  "Color"
+                              MemberName 8(PS_OUTPUT) 1  "Depth"
+                              Name 10  "@main("
+                              Name 13  "txval10"
+                              Name 16  "g_tTex1df4a"
+                              Name 20  "g_sSamp"
+                              Name 30  "txval11"
+                              Name 33  "g_tTex1di4a"
+                              Name 41  "txval12"
+                              Name 45  "g_tTex1du4a"
+                              Name 53  "txval20"
+                              Name 56  "g_tTex2df4a"
+                              Name 64  "txval21"
+                              Name 67  "g_tTex2di4a"
+                              Name 76  "txval22"
+                              Name 79  "g_tTex2du4a"
+                              Name 89  "txval40"
+                              Name 92  "g_tTexcdf4a"
+                              Name 101  "txval41"
+                              Name 104  "g_tTexcdi4a"
+                              Name 112  "txval42"
+                              Name 115  "g_tTexcdu4a"
+                              Name 127  "psout"
+                              Name 137  "flattenTemp"
+                              Name 140  "@entryPointOutput.Color"
+                              Name 144  "@entryPointOutput.Depth"
+                              Name 147  "g_tTex1df4"
+                              Decorate 16(g_tTex1df4a) DescriptorSet 0
+                              Decorate 16(g_tTex1df4a) Binding 1
+                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 20(g_sSamp) Binding 0
+                              Decorate 33(g_tTex1di4a) DescriptorSet 0
+                              Decorate 45(g_tTex1du4a) DescriptorSet 0
+                              Decorate 56(g_tTex2df4a) DescriptorSet 0
+                              Decorate 67(g_tTex2di4a) DescriptorSet 0
+                              Decorate 79(g_tTex2du4a) DescriptorSet 0
+                              Decorate 92(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 104(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 115(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 140(@entryPointOutput.Color) Location 0
+                              Decorate 144(@entryPointOutput.Depth) BuiltIn FragDepth
+                              Decorate 147(g_tTex1df4) DescriptorSet 0
+                              Decorate 147(g_tTex1df4) Binding 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeFloat 32
+               7:             TypeVector 6(float) 4
+    8(PS_OUTPUT):             TypeStruct 7(fvec4) 6(float)
+               9:             TypeFunction 8(PS_OUTPUT)
+              12:             TypePointer Function 6(float)
+              14:             TypeImage 6(float) 1D array sampled format:Unknown
+              15:             TypePointer UniformConstant 14
+ 16(g_tTex1df4a):     15(ptr) Variable UniformConstant
+              18:             TypeSampler
+              19:             TypePointer UniformConstant 18
+     20(g_sSamp):     19(ptr) Variable UniformConstant
+              22:             TypeSampledImage 14
+              24:    6(float) Constant 1036831949
+              25:             TypeVector 6(float) 2
+              27:             TypeInt 32 1
+              28:     27(int) Constant 1
+              31:             TypeImage 27(int) 1D array sampled format:Unknown
+              32:             TypePointer UniformConstant 31
+ 33(g_tTex1di4a):     32(ptr) Variable UniformConstant
+              36:             TypeSampledImage 31
+              38:    6(float) Constant 1045220557
+              42:             TypeInt 32 0
+              43:             TypeImage 42(int) 1D array sampled format:Unknown
+              44:             TypePointer UniformConstant 43
+ 45(g_tTex1du4a):     44(ptr) Variable UniformConstant
+              48:             TypeSampledImage 43
+              50:    6(float) Constant 1050253722
+              54:             TypeImage 6(float) 2D array sampled format:Unknown
+              55:             TypePointer UniformConstant 54
+ 56(g_tTex2df4a):     55(ptr) Variable UniformConstant
+              59:             TypeSampledImage 54
+              61:   25(fvec2) ConstantComposite 24 38
+              65:             TypeImage 27(int) 2D array sampled format:Unknown
+              66:             TypePointer UniformConstant 65
+ 67(g_tTex2di4a):     66(ptr) Variable UniformConstant
+              70:             TypeSampledImage 65
+              72:    6(float) Constant 1053609165
+              73:   25(fvec2) ConstantComposite 50 72
+              77:             TypeImage 42(int) 2D array sampled format:Unknown
+              78:             TypePointer UniformConstant 77
+ 79(g_tTex2du4a):     78(ptr) Variable UniformConstant
+              82:             TypeSampledImage 77
+              84:    6(float) Constant 1056964608
+              85:    6(float) Constant 1058642330
+              86:   25(fvec2) ConstantComposite 84 85
+              90:             TypeImage 6(float) Cube array sampled format:Unknown
+              91:             TypePointer UniformConstant 90
+ 92(g_tTexcdf4a):     91(ptr) Variable UniformConstant
+              95:             TypeSampledImage 90
+              97:             TypeVector 6(float) 3
+              98:   97(fvec3) ConstantComposite 24 38 50
+             102:             TypeImage 27(int) Cube array sampled format:Unknown
+             103:             TypePointer UniformConstant 102
+104(g_tTexcdi4a):    103(ptr) Variable UniformConstant
+             107:             TypeSampledImage 102
+             109:   97(fvec3) ConstantComposite 72 84 85
+             113:             TypeImage 42(int) Cube array sampled format:Unknown
+             114:             TypePointer UniformConstant 113
+115(g_tTexcdu4a):    114(ptr) Variable UniformConstant
+             118:             TypeSampledImage 113
+             120:    6(float) Constant 1060320051
+             121:    6(float) Constant 1061997773
+             122:    6(float) Constant 1063675494
+             123:   97(fvec3) ConstantComposite 120 121 122
+             126:             TypePointer Function 8(PS_OUTPUT)
+             128:     27(int) Constant 0
+             129:    6(float) Constant 1065353216
+             130:    7(fvec4) ConstantComposite 129 129 129 129
+             131:             TypePointer Function 7(fvec4)
+             139:             TypePointer Output 7(fvec4)
+140(@entryPointOutput.Color):    139(ptr) Variable Output
+             143:             TypePointer Output 6(float)
+144(@entryPointOutput.Depth):    143(ptr) Variable Output
+ 147(g_tTex1df4):     15(ptr) Variable UniformConstant
+         4(main):           2 Function None 3
+               5:             Label
+137(flattenTemp):    126(ptr) Variable Function
+             138:8(PS_OUTPUT) FunctionCall 10(@main()
+                              Store 137(flattenTemp) 138
+             141:    131(ptr) AccessChain 137(flattenTemp) 128
+             142:    7(fvec4) Load 141
+                              Store 140(@entryPointOutput.Color) 142
+             145:     12(ptr) AccessChain 137(flattenTemp) 28
+             146:    6(float) Load 145
+                              Store 144(@entryPointOutput.Depth) 146
+                              Return
+                              FunctionEnd
+      10(@main():8(PS_OUTPUT) Function None 9
+              11:             Label
+     13(txval10):     12(ptr) Variable Function
+     30(txval11):     12(ptr) Variable Function
+     41(txval12):     12(ptr) Variable Function
+     53(txval20):     12(ptr) Variable Function
+     64(txval21):     12(ptr) Variable Function
+     76(txval22):     12(ptr) Variable Function
+     89(txval40):     12(ptr) Variable Function
+    101(txval41):     12(ptr) Variable Function
+    112(txval42):     12(ptr) Variable Function
+      127(psout):    126(ptr) Variable Function
+              17:          14 Load 16(g_tTex1df4a)
+              21:          18 Load 20(g_sSamp)
+              23:          22 SampledImage 17 21
+              26:   25(fvec2) ImageQueryLod 23 24
+              29:    6(float) CompositeExtract 26 1
+                              Store 13(txval10) 29
+              34:          31 Load 33(g_tTex1di4a)
+              35:          18 Load 20(g_sSamp)
+              37:          36 SampledImage 34 35
+              39:   25(fvec2) ImageQueryLod 37 38
+              40:    6(float) CompositeExtract 39 1
+                              Store 30(txval11) 40
+              46:          43 Load 45(g_tTex1du4a)
+              47:          18 Load 20(g_sSamp)
+              49:          48 SampledImage 46 47
+              51:   25(fvec2) ImageQueryLod 49 50
+              52:    6(float) CompositeExtract 51 1
+                              Store 41(txval12) 52
+              57:          54 Load 56(g_tTex2df4a)
+              58:          18 Load 20(g_sSamp)
+              60:          59 SampledImage 57 58
+              62:   25(fvec2) ImageQueryLod 60 61
+              63:    6(float) CompositeExtract 62 1
+                              Store 53(txval20) 63
+              68:          65 Load 67(g_tTex2di4a)
+              69:          18 Load 20(g_sSamp)
+              71:          70 SampledImage 68 69
+              74:   25(fvec2) ImageQueryLod 71 73
+              75:    6(float) CompositeExtract 74 1
+                              Store 64(txval21) 75
+              80:          77 Load 79(g_tTex2du4a)
+              81:          18 Load 20(g_sSamp)
+              83:          82 SampledImage 80 81
+              87:   25(fvec2) ImageQueryLod 83 86
+              88:    6(float) CompositeExtract 87 1
+                              Store 76(txval22) 88
+              93:          90 Load 92(g_tTexcdf4a)
+              94:          18 Load 20(g_sSamp)
+              96:          95 SampledImage 93 94
+              99:   25(fvec2) ImageQueryLod 96 98
+             100:    6(float) CompositeExtract 99 1
+                              Store 89(txval40) 100
+             105:         102 Load 104(g_tTexcdi4a)
+             106:          18 Load 20(g_sSamp)
+             108:         107 SampledImage 105 106
+             110:   25(fvec2) ImageQueryLod 108 109
+             111:    6(float) CompositeExtract 110 1
+                              Store 101(txval41) 111
+             116:         113 Load 115(g_tTexcdu4a)
+             117:          18 Load 20(g_sSamp)
+             119:         118 SampledImage 116 117
+             124:   25(fvec2) ImageQueryLod 119 123
+             125:    6(float) CompositeExtract 124 1
+                              Store 112(txval42) 125
+             132:    131(ptr) AccessChain 127(psout) 128
+                              Store 132 130
+             133:     12(ptr) AccessChain 127(psout) 28
+                              Store 133 129
+             134:8(PS_OUTPUT) Load 127(psout)
+                              ReturnValue 134
+                              FunctionEnd

3rdparty/glslang/Test/baseResults/hlsl.pp.expand.frag.err

@@ -0,0 +1,3 @@
+ERROR: HLSL currently only supported when requesting SPIR-V for Vulkan.
+ERROR: HLSL currently only supported when requesting SPIR-V for Vulkan.
+

3rdparty/glslang/Test/baseResults/hlsl.pp.expand.frag.out

@@ -0,0 +1,18 @@
+
+
+
+
+
+
+struct A
+{
+    float4 a;
+    float4 b;
+    float4 c = { 1, 2, 3, 4 };
+    float4 d = {({ {(({ 1, 2, 3, 4 }))} })}, { { 1, 2, 3, 4 } };
+};
+
+void main()
+{
+}
+

3rdparty/glslang/Test/baseResults/preprocessor.bad_arg.vert.err

@@ -0,0 +1,4 @@
+ERROR: 0:8: 'macro expansion' : End of input in macro EXP2
+ERROR: 1 compilation errors.  No code generated.
+
+

3rdparty/glslang/Test/baseResults/samplerlessTextureFunctions.frag.out

@@ -0,0 +1,13 @@
+samplerlessTextureFunctions.frag
+ERROR: 0:9: 'texelFetch' : required extension not requested: GL_EXT_samplerless_texture_functions
+ERROR: 0:10: 'texelFetch' : required extension not requested: GL_EXT_samplerless_texture_functions
+ERROR: 0:16: 'texelFetchOffset' : required extension not requested: GL_EXT_samplerless_texture_functions
+ERROR: 0:18: 'textureSize' : required extension not requested: GL_EXT_samplerless_texture_functions
+ERROR: 0:19: 'textureSize' : required extension not requested: GL_EXT_samplerless_texture_functions
+ERROR: 0:20: 'textureSize' : required extension not requested: GL_EXT_samplerless_texture_functions
+ERROR: 0:22: 'textureQueryLevels' : required extension not requested: GL_EXT_samplerless_texture_functions
+ERROR: 0:24: 'textureSamples' : required extension not requested: GL_EXT_samplerless_texture_functions
+ERROR: 8 compilation errors.  No code generated.
+
+
+SPIR-V is not generated for failed compile or link

3rdparty/glslang/Test/baseResults/spv.16bitstorage-int.frag.out

@@ -0,0 +1,336 @@
+spv.16bitstorage-int.frag
+// Module Version 10000
+// Generated by (magic number): 80007
+// Id's are bound by 171
+
+                              Capability Shader
+                              Capability Int16
+                              Capability StorageUniformBufferBlock16
+                              Capability StorageUniform16
+                              Extension  "SPV_AMD_gpu_shader_int16"
+                              Extension  "SPV_KHR_16bit_storage"
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main"
+                              ExecutionMode 4 OriginUpperLeft
+                              Source GLSL 450
+                              SourceExtension  "GL_EXT_shader_16bit_storage"
+                              Name 4  "main"
+                              Name 12  "S"
+                              MemberName 12(S) 0  "x"
+                              MemberName 12(S) 1  "y"
+                              MemberName 12(S) 2  "z"
+                              Name 17  "B2"
+                              MemberName 17(B2) 0  "o"
+                              MemberName 17(B2) 1  "p"
+                              MemberName 17(B2) 2  "q"
+                              MemberName 17(B2) 3  "r"
+                              MemberName 17(B2) 4  "u"
+                              MemberName 17(B2) 5  "v"
+                              MemberName 17(B2) 6  "x"
+                              MemberName 17(B2) 7  "w"
+                              Name 19  "b2"
+                              Name 23  "S"
+                              MemberName 23(S) 0  "x"
+                              MemberName 23(S) 1  "y"
+                              MemberName 23(S) 2  "z"
+                              Name 25  "B1"
+                              MemberName 25(B1) 0  "a"
+                              MemberName 25(B1) 1  "b"
+                              MemberName 25(B1) 2  "c"
+                              MemberName 25(B1) 3  "d"
+                              MemberName 25(B1) 4  "g"
+                              MemberName 25(B1) 5  "h"
+                              MemberName 25(B1) 6  "j"
+                              Name 27  "b1"
+                              Name 45  "S"
+                              MemberName 45(S) 0  "x"
+                              MemberName 45(S) 1  "y"
+                              MemberName 45(S) 2  "z"
+                              Name 49  "B5"
+                              MemberName 49(B5) 0  "o"
+                              MemberName 49(B5) 1  "p"
+                              MemberName 49(B5) 2  "q"
+                              MemberName 49(B5) 3  "r"
+                              MemberName 49(B5) 4  "u"
+                              MemberName 49(B5) 5  "v"
+                              MemberName 49(B5) 6  "x"
+                              MemberName 49(B5) 7  "w"
+                              Name 51  "b5"
+                              Name 69  "x0"
+                              Name 75  "x1"
+                              Name 88  "S2"
+                              MemberName 88(S2) 0  "x"
+                              MemberName 88(S2) 1  "y"
+                              MemberName 88(S2) 2  "z"
+                              Name 89  "S3"
+                              MemberName 89(S3) 0  "x"
+                              Name 90  "B4"
+                              MemberName 90(B4) 0  "x"
+                              MemberName 90(B4) 1  "y"
+                              Name 92  "b4"
+                              Name 93  "S2"
+                              MemberName 93(S2) 0  "x"
+                              MemberName 93(S2) 1  "y"
+                              MemberName 93(S2) 2  "z"
+                              Name 94  "B3"
+                              MemberName 94(B3) 0  "x"
+                              Name 96  "b3"
+                              Name 113  "v3"
+                              Name 135  "u3"
+                              Decorate 11 ArrayStride 2
+                              MemberDecorate 12(S) 0 Offset 0
+                              MemberDecorate 12(S) 1 Offset 4
+                              MemberDecorate 12(S) 2 Offset 8
+                              Decorate 13 ArrayStride 16
+                              Decorate 15 ArrayStride 4
+                              Decorate 16 ArrayStride 2
+                              MemberDecorate 17(B2) 0 Offset 0
+                              MemberDecorate 17(B2) 1 Offset 4
+                              MemberDecorate 17(B2) 2 Offset 8
+                              MemberDecorate 17(B2) 3 Offset 14
+                              MemberDecorate 17(B2) 4 Offset 24
+                              MemberDecorate 17(B2) 5 Offset 40
+                              MemberDecorate 17(B2) 6 Offset 72
+                              MemberDecorate 17(B2) 7 Offset 472
+                              Decorate 17(B2) BufferBlock
+                              Decorate 19(b2) DescriptorSet 0
+                              Decorate 22 ArrayStride 16
+                              MemberDecorate 23(S) 0 Offset 0
+                              MemberDecorate 23(S) 1 Offset 4
+                              MemberDecorate 23(S) 2 Offset 8
+                              Decorate 24 ArrayStride 16
+                              MemberDecorate 25(B1) 0 Offset 0
+                              MemberDecorate 25(B1) 1 Offset 4
+                              MemberDecorate 25(B1) 2 Offset 8
+                              MemberDecorate 25(B1) 3 Offset 16
+                              MemberDecorate 25(B1) 4 Offset 48
+                              MemberDecorate 25(B1) 5 Offset 64
+                              MemberDecorate 25(B1) 6 Offset 96
+                              Decorate 25(B1) Block
+                              Decorate 27(b1) DescriptorSet 0
+                              Decorate 44 ArrayStride 16
+                              MemberDecorate 45(S) 0 Offset 0
+                              MemberDecorate 45(S) 1 Offset 4
+                              MemberDecorate 45(S) 2 Offset 8
+                              Decorate 46 ArrayStride 16
+                              Decorate 47 ArrayStride 16
+                              Decorate 48 ArrayStride 16
+                              MemberDecorate 49(B5) 0 Offset 0
+                              MemberDecorate 49(B5) 1 Offset 4
+                              MemberDecorate 49(B5) 2 Offset 8
+                              MemberDecorate 49(B5) 3 Offset 16
+                              MemberDecorate 49(B5) 4 Offset 48
+                              MemberDecorate 49(B5) 5 Offset 64
+                              MemberDecorate 49(B5) 6 Offset 96
+                              MemberDecorate 49(B5) 7 Offset 1696
+                              Decorate 49(B5) Block
+                              Decorate 51(b5) DescriptorSet 0
+                              MemberDecorate 88(S2) 0 ColMajor
+                              MemberDecorate 88(S2) 0 Offset 0
+                              MemberDecorate 88(S2) 0 MatrixStride 16
+                              MemberDecorate 88(S2) 1 Offset 64
+                              MemberDecorate 88(S2) 2 Offset 68
+                              MemberDecorate 89(S3) 0 Offset 0
+                              MemberDecorate 90(B4) 0 Offset 0
+                              MemberDecorate 90(B4) 1 Offset 80
+                              Decorate 90(B4) BufferBlock
+                              Decorate 92(b4) DescriptorSet 0
+                              MemberDecorate 93(S2) 0 RowMajor
+                              MemberDecorate 93(S2) 0 Offset 0
+                              MemberDecorate 93(S2) 0 MatrixStride 16
+                              MemberDecorate 93(S2) 1 Offset 64
+                              MemberDecorate 93(S2) 2 Offset 68
+                              MemberDecorate 94(B3) 0 Offset 0
+                              Decorate 94(B3) BufferBlock
+                              Decorate 96(b3) DescriptorSet 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeInt 16 1
+               7:             TypeVector 6(int16_t) 2
+               8:             TypeVector 6(int16_t) 3
+               9:             TypeInt 32 0
+              10:      9(int) Constant 2
+              11:             TypeArray 6(int16_t) 10
+           12(S):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3)
+              13:             TypeArray 12(S) 10
+              14:      9(int) Constant 100
+              15:             TypeArray 7(i16vec2) 14
+              16:             TypeRuntimeArray 6(int16_t)
+          17(B2):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3) 11 12(S) 13 15 16
+              18:             TypePointer Uniform 17(B2)
+          19(b2):     18(ptr) Variable Uniform
+              20:             TypeInt 32 1
+              21:     20(int) Constant 0
+              22:             TypeArray 6(int16_t) 10
+           23(S):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3)
+              24:             TypeArray 23(S) 10
+          25(B1):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3) 22 23(S) 24 20(int)
+              26:             TypePointer Uniform 25(B1)
+          27(b1):     26(ptr) Variable Uniform
+              28:             TypePointer Uniform 6(int16_t)
+              32:     20(int) Constant 1
+              33:     20(int) Constant 2
+              34:             TypePointer Uniform 8(i16vec3)
+              37:             TypeVector 20(int) 3
+              39:             TypeVector 20(int) 2
+              42:             TypePointer Uniform 7(i16vec2)
+              44:             TypeArray 6(int16_t) 10
+           45(S):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3)
+              46:             TypeArray 45(S) 10
+              47:             TypeArray 7(i16vec2) 14
+              48:             TypeArray 6(int16_t) 14
+          49(B5):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3) 44 45(S) 46 47 48
+              50:             TypePointer Uniform 49(B5)
+          51(b5):     50(ptr) Variable Uniform
+              58:     20(int) Constant 3
+              68:             TypePointer Function 20(int)
+              73:             TypeVector 20(int) 4
+              74:             TypePointer Function 73(ivec4)
+              85:             TypeFloat 32
+              86:             TypeVector 85(float) 4
+              87:             TypeMatrix 86(fvec4) 4
+          88(S2):             TypeStruct 87 6(int16_t) 20(int)
+          89(S3):             TypeStruct 88(S2)
+          90(B4):             TypeStruct 88(S2) 89(S3)
+              91:             TypePointer Uniform 90(B4)
+          92(b4):     91(ptr) Variable Uniform
+          93(S2):             TypeStruct 87 6(int16_t) 20(int)
+          94(B3):             TypeStruct 93(S2)
+              95:             TypePointer Uniform 94(B3)
+          96(b3):     95(ptr) Variable Uniform
+              97:             TypePointer Uniform 87
+             104:      9(int) Constant 0
+             108:     20(int) Constant 5
+             112:             TypePointer Function 37(ivec3)
+             114:     20(int) Constant 7
+             115:     20(int) Constant 6
+             116:             TypePointer Uniform 20(int)
+             166:   39(ivec2) ConstantComposite 32 33
+         4(main):           2 Function None 3
+               5:             Label
+          69(x0):     68(ptr) Variable Function
+          75(x1):     74(ptr) Variable Function
+         113(v3):    112(ptr) Variable Function
+         135(u3):    112(ptr) Variable Function
+              29:     28(ptr) AccessChain 27(b1) 21
+              30:  6(int16_t) Load 29
+              31:     28(ptr) AccessChain 19(b2) 21
+                              Store 31 30
+              35:     34(ptr) AccessChain 19(b2) 33
+              36:  8(i16vec3) Load 35
+              38:   37(ivec3) SConvert 36
+              40:   39(ivec2) VectorShuffle 38 38 0 1
+              41:  7(i16vec2) SConvert 40
+              43:     42(ptr) AccessChain 19(b2) 32
+                              Store 43 41
+              52:     34(ptr) AccessChain 51(b5) 33
+              53:  8(i16vec3) Load 52
+              54:   37(ivec3) SConvert 53
+              55:   39(ivec2) VectorShuffle 54 54 0 1
+              56:  7(i16vec2) SConvert 55
+              57:     42(ptr) AccessChain 19(b2) 32
+                              Store 57 56
+              59:     28(ptr) AccessChain 19(b2) 58 21
+              60:  6(int16_t) Load 59
+              61:     28(ptr) AccessChain 19(b2) 58 21
+                              Store 61 60
+              62:     28(ptr) AccessChain 51(b5) 58 32
+              63:  6(int16_t) Load 62
+              64:     28(ptr) AccessChain 19(b2) 58 32
+                              Store 64 63
+              65:     42(ptr) AccessChain 19(b2) 32
+              66:  7(i16vec2) Load 65
+              67:     42(ptr) AccessChain 19(b2) 32
+                              Store 67 66
+              70:     28(ptr) AccessChain 27(b1) 21
+              71:  6(int16_t) Load 70
+              72:     20(int) SConvert 71
+                              Store 69(x0) 72
+              76:     28(ptr) AccessChain 27(b1) 21
+              77:  6(int16_t) Load 76
+              78:     20(int) SConvert 77
+              79:     42(ptr) AccessChain 19(b2) 32
+              80:  7(i16vec2) Load 79
+              81:   39(ivec2) SConvert 80
+              82:     20(int) CompositeExtract 81 0
+              83:     20(int) CompositeExtract 81 1
+              84:   73(ivec4) CompositeConstruct 78 82 83 32
+                              Store 75(x1) 84
+              98:     97(ptr) AccessChain 96(b3) 21 21
+              99:          87 Load 98
+             100:     97(ptr) AccessChain 92(b4) 21 21
+                              Store 100 99
+             101:     42(ptr) AccessChain 19(b2) 32
+             102:  7(i16vec2) Load 101
+             103:   39(ivec2) SConvert 102
+             105:     20(int) CompositeExtract 103 0
+             106:  6(int16_t) SConvert 105
+             107:     28(ptr) AccessChain 19(b2) 21
+                              Store 107 106
+             109:     42(ptr) AccessChain 19(b2) 108 32 32
+             110:  7(i16vec2) Load 109
+             111:     42(ptr) AccessChain 19(b2) 32
+                              Store 111 110
+             117:    116(ptr) AccessChain 27(b1) 115
+             118:     20(int) Load 117
+             119:     28(ptr) AccessChain 19(b2) 114 118
+             120:  6(int16_t) Load 119
+             121:     20(int) SConvert 120
+             122:    116(ptr) AccessChain 27(b1) 115
+             123:     20(int) Load 122
+             124:     20(int) IAdd 123 32
+             125:     28(ptr) AccessChain 19(b2) 114 124
+             126:  6(int16_t) Load 125
+             127:     20(int) SConvert 126
+             128:    116(ptr) AccessChain 27(b1) 115
+             129:     20(int) Load 128
+             130:     20(int) IAdd 129 33
+             131:     28(ptr) AccessChain 19(b2) 114 130
+             132:  6(int16_t) Load 131
+             133:     20(int) SConvert 132
+             134:   37(ivec3) CompositeConstruct 121 127 133
+                              Store 113(v3) 134
+             136:    116(ptr) AccessChain 27(b1) 115
+             137:     20(int) Load 136
+             138:     28(ptr) AccessChain 51(b5) 114 137
+             139:  6(int16_t) Load 138
+             140:     20(int) SConvert 139
+             141:    116(ptr) AccessChain 27(b1) 115
+             142:     20(int) Load 141
+             143:     20(int) IAdd 142 32
+             144:     28(ptr) AccessChain 51(b5) 114 143
+             145:  6(int16_t) Load 144
+             146:     20(int) SConvert 145
+             147:    116(ptr) AccessChain 27(b1) 115
+             148:     20(int) Load 147
+             149:     20(int) IAdd 148 33
+             150:     28(ptr) AccessChain 51(b5) 114 149
+             151:  6(int16_t) Load 150
+             152:     20(int) SConvert 151
+             153:   37(ivec3) CompositeConstruct 140 146 152
+                              Store 135(u3) 153
+             154:     42(ptr) AccessChain 19(b2) 115 21
+             155:  7(i16vec2) Load 154
+             156:     42(ptr) AccessChain 19(b2) 115 21
+                              Store 156 155
+             157:     42(ptr) AccessChain 51(b5) 115 32
+             158:  7(i16vec2) Load 157
+             159:     42(ptr) AccessChain 19(b2) 115 32
+                              Store 159 158
+             160:     28(ptr) AccessChain 27(b1) 21
+             161:  6(int16_t) Load 160
+             162:     28(ptr) AccessChain 19(b2) 32 104
+                              Store 162 161
+             163:     28(ptr) AccessChain 19(b2) 32 104
+             164:  6(int16_t) Load 163
+             165:     28(ptr) AccessChain 19(b2) 21
+                              Store 165 164
+             167:  7(i16vec2) SConvert 166
+             168:     42(ptr) AccessChain 19(b2) 32
+                              Store 168 167
+             169:  6(int16_t) SConvert 58
+             170:     28(ptr) AccessChain 19(b2) 21
+                              Store 170 169
+                              Return
+                              FunctionEnd

3rdparty/glslang/Test/baseResults/spv.16bitstorage-uint.frag.out

@@ -0,0 +1,338 @@
+spv.16bitstorage-uint.frag
+// Module Version 10000
+// Generated by (magic number): 80007
+// Id's are bound by 173
+
+                              Capability Shader
+                              Capability Int16
+                              Capability StorageUniformBufferBlock16
+                              Capability StorageUniform16
+                              Extension  "SPV_AMD_gpu_shader_int16"
+                              Extension  "SPV_KHR_16bit_storage"
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main"
+                              ExecutionMode 4 OriginUpperLeft
+                              Source GLSL 450
+                              SourceExtension  "GL_EXT_shader_16bit_storage"
+                              Name 4  "main"
+                              Name 12  "S"
+                              MemberName 12(S) 0  "x"
+                              MemberName 12(S) 1  "y"
+                              MemberName 12(S) 2  "z"
+                              Name 17  "B2"
+                              MemberName 17(B2) 0  "o"
+                              MemberName 17(B2) 1  "p"
+                              MemberName 17(B2) 2  "q"
+                              MemberName 17(B2) 3  "r"
+                              MemberName 17(B2) 4  "u"
+                              MemberName 17(B2) 5  "v"
+                              MemberName 17(B2) 6  "x"
+                              MemberName 17(B2) 7  "w"
+                              Name 19  "b2"
+                              Name 23  "S"
+                              MemberName 23(S) 0  "x"
+                              MemberName 23(S) 1  "y"
+                              MemberName 23(S) 2  "z"
+                              Name 25  "B1"
+                              MemberName 25(B1) 0  "a"
+                              MemberName 25(B1) 1  "b"
+                              MemberName 25(B1) 2  "c"
+                              MemberName 25(B1) 3  "d"
+                              MemberName 25(B1) 4  "g"
+                              MemberName 25(B1) 5  "h"
+                              MemberName 25(B1) 6  "j"
+                              Name 27  "b1"
+                              Name 45  "S"
+                              MemberName 45(S) 0  "x"
+                              MemberName 45(S) 1  "y"
+                              MemberName 45(S) 2  "z"
+                              Name 49  "B5"
+                              MemberName 49(B5) 0  "o"
+                              MemberName 49(B5) 1  "p"
+                              MemberName 49(B5) 2  "q"
+                              MemberName 49(B5) 3  "r"
+                              MemberName 49(B5) 4  "u"
+                              MemberName 49(B5) 5  "v"
+                              MemberName 49(B5) 6  "x"
+                              MemberName 49(B5) 7  "w"
+                              Name 51  "b5"
+                              Name 69  "x0"
+                              Name 75  "x1"
+                              Name 89  "S2"
+                              MemberName 89(S2) 0  "x"
+                              MemberName 89(S2) 1  "y"
+                              MemberName 89(S2) 2  "z"
+                              Name 90  "S3"
+                              MemberName 90(S3) 0  "x"
+                              Name 91  "B4"
+                              MemberName 91(B4) 0  "x"
+                              MemberName 91(B4) 1  "y"
+                              Name 93  "b4"
+                              Name 94  "S2"
+                              MemberName 94(S2) 0  "x"
+                              MemberName 94(S2) 1  "y"
+                              MemberName 94(S2) 2  "z"
+                              Name 95  "B3"
+                              MemberName 95(B3) 0  "x"
+                              Name 97  "b3"
+                              Name 114  "v3"
+                              Name 136  "u3"
+                              Decorate 11 ArrayStride 2
+                              MemberDecorate 12(S) 0 Offset 0
+                              MemberDecorate 12(S) 1 Offset 4
+                              MemberDecorate 12(S) 2 Offset 8
+                              Decorate 13 ArrayStride 16
+                              Decorate 15 ArrayStride 4
+                              Decorate 16 ArrayStride 2
+                              MemberDecorate 17(B2) 0 Offset 0
+                              MemberDecorate 17(B2) 1 Offset 4
+                              MemberDecorate 17(B2) 2 Offset 8
+                              MemberDecorate 17(B2) 3 Offset 14
+                              MemberDecorate 17(B2) 4 Offset 24
+                              MemberDecorate 17(B2) 5 Offset 40
+                              MemberDecorate 17(B2) 6 Offset 72
+                              MemberDecorate 17(B2) 7 Offset 472
+                              Decorate 17(B2) BufferBlock
+                              Decorate 19(b2) DescriptorSet 0
+                              Decorate 22 ArrayStride 16
+                              MemberDecorate 23(S) 0 Offset 0
+                              MemberDecorate 23(S) 1 Offset 4
+                              MemberDecorate 23(S) 2 Offset 8
+                              Decorate 24 ArrayStride 16
+                              MemberDecorate 25(B1) 0 Offset 0
+                              MemberDecorate 25(B1) 1 Offset 4
+                              MemberDecorate 25(B1) 2 Offset 8
+                              MemberDecorate 25(B1) 3 Offset 16
+                              MemberDecorate 25(B1) 4 Offset 48
+                              MemberDecorate 25(B1) 5 Offset 64
+                              MemberDecorate 25(B1) 6 Offset 96
+                              Decorate 25(B1) Block
+                              Decorate 27(b1) DescriptorSet 0
+                              Decorate 44 ArrayStride 16
+                              MemberDecorate 45(S) 0 Offset 0
+                              MemberDecorate 45(S) 1 Offset 4
+                              MemberDecorate 45(S) 2 Offset 8
+                              Decorate 46 ArrayStride 16
+                              Decorate 47 ArrayStride 16
+                              Decorate 48 ArrayStride 16
+                              MemberDecorate 49(B5) 0 Offset 0
+                              MemberDecorate 49(B5) 1 Offset 4
+                              MemberDecorate 49(B5) 2 Offset 8
+                              MemberDecorate 49(B5) 3 Offset 16
+                              MemberDecorate 49(B5) 4 Offset 48
+                              MemberDecorate 49(B5) 5 Offset 64
+                              MemberDecorate 49(B5) 6 Offset 96
+                              MemberDecorate 49(B5) 7 Offset 1696
+                              Decorate 49(B5) Block
+                              Decorate 51(b5) DescriptorSet 0
+                              MemberDecorate 89(S2) 0 ColMajor
+                              MemberDecorate 89(S2) 0 Offset 0
+                              MemberDecorate 89(S2) 0 MatrixStride 16
+                              MemberDecorate 89(S2) 1 Offset 64
+                              MemberDecorate 89(S2) 2 Offset 68
+                              MemberDecorate 90(S3) 0 Offset 0
+                              MemberDecorate 91(B4) 0 Offset 0
+                              MemberDecorate 91(B4) 1 Offset 80
+                              Decorate 91(B4) BufferBlock
+                              Decorate 93(b4) DescriptorSet 0
+                              MemberDecorate 94(S2) 0 RowMajor
+                              MemberDecorate 94(S2) 0 Offset 0
+                              MemberDecorate 94(S2) 0 MatrixStride 16
+                              MemberDecorate 94(S2) 1 Offset 64
+                              MemberDecorate 94(S2) 2 Offset 68
+                              MemberDecorate 95(B3) 0 Offset 0
+                              Decorate 95(B3) BufferBlock
+                              Decorate 97(b3) DescriptorSet 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeInt 16 0
+               7:             TypeVector 6(int16_t) 2
+               8:             TypeVector 6(int16_t) 3
+               9:             TypeInt 32 0
+              10:      9(int) Constant 2
+              11:             TypeArray 6(int16_t) 10
+           12(S):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3)
+              13:             TypeArray 12(S) 10
+              14:      9(int) Constant 100
+              15:             TypeArray 7(i16vec2) 14
+              16:             TypeRuntimeArray 6(int16_t)
+          17(B2):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3) 11 12(S) 13 15 16
+              18:             TypePointer Uniform 17(B2)
+          19(b2):     18(ptr) Variable Uniform
+              20:             TypeInt 32 1
+              21:     20(int) Constant 0
+              22:             TypeArray 6(int16_t) 10
+           23(S):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3)
+              24:             TypeArray 23(S) 10
+          25(B1):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3) 22 23(S) 24 9(int)
+              26:             TypePointer Uniform 25(B1)
+          27(b1):     26(ptr) Variable Uniform
+              28:             TypePointer Uniform 6(int16_t)
+              32:     20(int) Constant 1
+              33:     20(int) Constant 2
+              34:             TypePointer Uniform 8(i16vec3)
+              37:             TypeVector 9(int) 3
+              39:             TypeVector 9(int) 2
+              42:             TypePointer Uniform 7(i16vec2)
+              44:             TypeArray 6(int16_t) 10
+           45(S):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3)
+              46:             TypeArray 45(S) 10
+              47:             TypeArray 7(i16vec2) 14
+              48:             TypeArray 6(int16_t) 14
+          49(B5):             TypeStruct 6(int16_t) 7(i16vec2) 8(i16vec3) 44 45(S) 46 47 48
+              50:             TypePointer Uniform 49(B5)
+          51(b5):     50(ptr) Variable Uniform
+              58:     20(int) Constant 3
+              68:             TypePointer Function 9(int)
+              73:             TypeVector 9(int) 4
+              74:             TypePointer Function 73(ivec4)
+              82:      9(int) Constant 1
+              86:             TypeFloat 32
+              87:             TypeVector 86(float) 4
+              88:             TypeMatrix 87(fvec4) 4
+          89(S2):             TypeStruct 88 6(int16_t) 9(int)
+          90(S3):             TypeStruct 89(S2)
+          91(B4):             TypeStruct 89(S2) 90(S3)
+              92:             TypePointer Uniform 91(B4)
+          93(b4):     92(ptr) Variable Uniform
+          94(S2):             TypeStruct 88 6(int16_t) 9(int)
+          95(B3):             TypeStruct 94(S2)
+              96:             TypePointer Uniform 95(B3)
+          97(b3):     96(ptr) Variable Uniform
+              98:             TypePointer Uniform 88
+             105:      9(int) Constant 0
+             109:     20(int) Constant 5
+             113:             TypePointer Function 37(ivec3)
+             115:     20(int) Constant 7
+             116:     20(int) Constant 6
+             117:             TypePointer Uniform 9(int)
+             167:   39(ivec2) ConstantComposite 82 10
+             170:      9(int) Constant 3
+         4(main):           2 Function None 3
+               5:             Label
+          69(x0):     68(ptr) Variable Function
+          75(x1):     74(ptr) Variable Function
+         114(v3):    113(ptr) Variable Function
+         136(u3):    113(ptr) Variable Function
+              29:     28(ptr) AccessChain 27(b1) 21
+              30:  6(int16_t) Load 29
+              31:     28(ptr) AccessChain 19(b2) 21
+                              Store 31 30
+              35:     34(ptr) AccessChain 19(b2) 33
+              36:  8(i16vec3) Load 35
+              38:   37(ivec3) UConvert 36
+              40:   39(ivec2) VectorShuffle 38 38 0 1
+              41:  7(i16vec2) UConvert 40
+              43:     42(ptr) AccessChain 19(b2) 32
+                              Store 43 41
+              52:     34(ptr) AccessChain 51(b5) 33
+              53:  8(i16vec3) Load 52
+              54:   37(ivec3) UConvert 53
+              55:   39(ivec2) VectorShuffle 54 54 0 1
+              56:  7(i16vec2) UConvert 55
+              57:     42(ptr) AccessChain 19(b2) 32
+                              Store 57 56
+              59:     28(ptr) AccessChain 19(b2) 58 21
+              60:  6(int16_t) Load 59
+              61:     28(ptr) AccessChain 19(b2) 58 21
+                              Store 61 60
+              62:     28(ptr) AccessChain 51(b5) 58 32
+              63:  6(int16_t) Load 62
+              64:     28(ptr) AccessChain 19(b2) 58 32
+                              Store 64 63
+              65:     42(ptr) AccessChain 19(b2) 32
+              66:  7(i16vec2) Load 65
+              67:     42(ptr) AccessChain 19(b2) 32
+                              Store 67 66
+              70:     28(ptr) AccessChain 27(b1) 21
+              71:  6(int16_t) Load 70
+              72:      9(int) UConvert 71
+                              Store 69(x0) 72
+              76:     28(ptr) AccessChain 27(b1) 21
+              77:  6(int16_t) Load 76
+              78:      9(int) UConvert 77
+              79:     42(ptr) AccessChain 19(b2) 32
+              80:  7(i16vec2) Load 79
+              81:   39(ivec2) UConvert 80
+              83:      9(int) CompositeExtract 81 0
+              84:      9(int) CompositeExtract 81 1
+              85:   73(ivec4) CompositeConstruct 78 83 84 82
+                              Store 75(x1) 85
+              99:     98(ptr) AccessChain 97(b3) 21 21
+             100:          88 Load 99
+             101:     98(ptr) AccessChain 93(b4) 21 21
+                              Store 101 100
+             102:     42(ptr) AccessChain 19(b2) 32
+             103:  7(i16vec2) Load 102
+             104:   39(ivec2) UConvert 103
+             106:      9(int) CompositeExtract 104 0
+             107:  6(int16_t) UConvert 106
+             108:     28(ptr) AccessChain 19(b2) 21
+                              Store 108 107
+             110:     42(ptr) AccessChain 19(b2) 109 32 32
+             111:  7(i16vec2) Load 110
+             112:     42(ptr) AccessChain 19(b2) 32
+                              Store 112 111
+             118:    117(ptr) AccessChain 27(b1) 116
+             119:      9(int) Load 118
+             120:     28(ptr) AccessChain 19(b2) 115 119
+             121:  6(int16_t) Load 120
+             122:      9(int) UConvert 121
+             123:    117(ptr) AccessChain 27(b1) 116
+             124:      9(int) Load 123
+             125:      9(int) IAdd 124 82
+             126:     28(ptr) AccessChain 19(b2) 115 125
+             127:  6(int16_t) Load 126
+             128:      9(int) UConvert 127
+             129:    117(ptr) AccessChain 27(b1) 116
+             130:      9(int) Load 129
+             131:      9(int) IAdd 130 10
+             132:     28(ptr) AccessChain 19(b2) 115 131
+             133:  6(int16_t) Load 132
+             134:      9(int) UConvert 133
+             135:   37(ivec3) CompositeConstruct 122 128 134
+                              Store 114(v3) 135
+             137:    117(ptr) AccessChain 27(b1) 116
+             138:      9(int) Load 137
+             139:     28(ptr) AccessChain 51(b5) 115 138
+             140:  6(int16_t) Load 139
+             141:      9(int) UConvert 140
+             142:    117(ptr) AccessChain 27(b1) 116
+             143:      9(int) Load 142
+             144:      9(int) IAdd 143 82
+             145:     28(ptr) AccessChain 51(b5) 115 144
+             146:  6(int16_t) Load 145
+             147:      9(int) UConvert 146
+             148:    117(ptr) AccessChain 27(b1) 116
+             149:      9(int) Load 148
+             150:      9(int) IAdd 149 10
+             151:     28(ptr) AccessChain 51(b5) 115 150
+             152:  6(int16_t) Load 151
+             153:      9(int) UConvert 152
+             154:   37(ivec3) CompositeConstruct 141 147 153
+                              Store 136(u3) 154
+             155:     42(ptr) AccessChain 19(b2) 116 21
+             156:  7(i16vec2) Load 155
+             157:     42(ptr) AccessChain 19(b2) 116 21
+                              Store 157 156
+             158:     42(ptr) AccessChain 51(b5) 116 32
+             159:  7(i16vec2) Load 158
+             160:     42(ptr) AccessChain 19(b2) 116 32
+                              Store 160 159
+             161:     28(ptr) AccessChain 27(b1) 21
+             162:  6(int16_t) Load 161
+             163:     28(ptr) AccessChain 19(b2) 32 105
+                              Store 163 162
+             164:     28(ptr) AccessChain 19(b2) 32 105
+             165:  6(int16_t) Load 164
+             166:     28(ptr) AccessChain 19(b2) 21
+                              Store 166 165
+             168:  7(i16vec2) UConvert 167
+             169:     42(ptr) AccessChain 19(b2) 32
+                              Store 169 168
+             171:  6(int16_t) UConvert 170
+             172:     28(ptr) AccessChain 19(b2) 21
+                              Store 172 171
+                              Return
+                              FunctionEnd

3rdparty/glslang/Test/baseResults/spv.16bitstorage.frag.out

@@ -0,0 +1,338 @@
+spv.16bitstorage.frag
+// Module Version 10000
+// Generated by (magic number): 80007
+// Id's are bound by 173
+
+                              Capability Shader
+                              Capability Float16
+                              Capability StorageUniformBufferBlock16
+                              Capability StorageUniform16
+                              Extension  "SPV_AMD_gpu_shader_half_float"
+                              Extension  "SPV_KHR_16bit_storage"
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main"
+                              ExecutionMode 4 OriginUpperLeft
+                              Source GLSL 450
+                              SourceExtension  "GL_EXT_shader_16bit_storage"
+                              Name 4  "main"
+                              Name 12  "S"
+                              MemberName 12(S) 0  "x"
+                              MemberName 12(S) 1  "y"
+                              MemberName 12(S) 2  "z"
+                              Name 17  "B2"
+                              MemberName 17(B2) 0  "o"
+                              MemberName 17(B2) 1  "p"
+                              MemberName 17(B2) 2  "q"
+                              MemberName 17(B2) 3  "r"
+                              MemberName 17(B2) 4  "u"
+                              MemberName 17(B2) 5  "v"
+                              MemberName 17(B2) 6  "x"
+                              MemberName 17(B2) 7  "w"
+                              Name 19  "b2"
+                              Name 23  "S"
+                              MemberName 23(S) 0  "x"
+                              MemberName 23(S) 1  "y"
+                              MemberName 23(S) 2  "z"
+                              Name 25  "B1"
+                              MemberName 25(B1) 0  "a"
+                              MemberName 25(B1) 1  "b"
+                              MemberName 25(B1) 2  "c"
+                              MemberName 25(B1) 3  "d"
+                              MemberName 25(B1) 4  "g"
+                              MemberName 25(B1) 5  "h"
+                              MemberName 25(B1) 6  "j"
+                              Name 27  "b1"
+                              Name 46  "S"
+                              MemberName 46(S) 0  "x"
+                              MemberName 46(S) 1  "y"
+                              MemberName 46(S) 2  "z"
+                              Name 50  "B5"
+                              MemberName 50(B5) 0  "o"
+                              MemberName 50(B5) 1  "p"
+                              MemberName 50(B5) 2  "q"
+                              MemberName 50(B5) 3  "r"
+                              MemberName 50(B5) 4  "u"
+                              MemberName 50(B5) 5  "v"
+                              MemberName 50(B5) 6  "x"
+                              MemberName 50(B5) 7  "w"
+                              Name 52  "b5"
+                              Name 70  "x0"
+                              Name 76  "x1"
+                              Name 88  "S2"
+                              MemberName 88(S2) 0  "x"
+                              MemberName 88(S2) 1  "y"
+                              MemberName 88(S2) 2  "z"
+                              Name 89  "S3"
+                              MemberName 89(S3) 0  "x"
+                              Name 90  "B4"
+                              MemberName 90(B4) 0  "x"
+                              MemberName 90(B4) 1  "y"
+                              Name 92  "b4"
+                              Name 93  "S2"
+                              MemberName 93(S2) 0  "x"
+                              MemberName 93(S2) 1  "y"
+                              MemberName 93(S2) 2  "z"
+                              Name 94  "B3"
+                              MemberName 94(B3) 0  "x"
+                              Name 96  "b3"
+                              Name 113  "v3"
+                              Name 135  "u3"
+                              Decorate 11 ArrayStride 2
+                              MemberDecorate 12(S) 0 Offset 0
+                              MemberDecorate 12(S) 1 Offset 4
+                              MemberDecorate 12(S) 2 Offset 8
+                              Decorate 13 ArrayStride 16
+                              Decorate 15 ArrayStride 4
+                              Decorate 16 ArrayStride 2
+                              MemberDecorate 17(B2) 0 Offset 0
+                              MemberDecorate 17(B2) 1 Offset 4
+                              MemberDecorate 17(B2) 2 Offset 8
+                              MemberDecorate 17(B2) 3 Offset 14
+                              MemberDecorate 17(B2) 4 Offset 24
+                              MemberDecorate 17(B2) 5 Offset 40
+                              MemberDecorate 17(B2) 6 Offset 72
+                              MemberDecorate 17(B2) 7 Offset 472
+                              Decorate 17(B2) BufferBlock
+                              Decorate 19(b2) DescriptorSet 0
+                              Decorate 22 ArrayStride 16
+                              MemberDecorate 23(S) 0 Offset 0
+                              MemberDecorate 23(S) 1 Offset 4
+                              MemberDecorate 23(S) 2 Offset 8
+                              Decorate 24 ArrayStride 16
+                              MemberDecorate 25(B1) 0 Offset 0
+                              MemberDecorate 25(B1) 1 Offset 4
+                              MemberDecorate 25(B1) 2 Offset 8
+                              MemberDecorate 25(B1) 3 Offset 16
+                              MemberDecorate 25(B1) 4 Offset 48
+                              MemberDecorate 25(B1) 5 Offset 64
+                              MemberDecorate 25(B1) 6 Offset 96
+                              Decorate 25(B1) Block
+                              Decorate 27(b1) DescriptorSet 0
+                              Decorate 45 ArrayStride 16
+                              MemberDecorate 46(S) 0 Offset 0
+                              MemberDecorate 46(S) 1 Offset 4
+                              MemberDecorate 46(S) 2 Offset 8
+                              Decorate 47 ArrayStride 16
+                              Decorate 48 ArrayStride 16
+                              Decorate 49 ArrayStride 16
+                              MemberDecorate 50(B5) 0 Offset 0
+                              MemberDecorate 50(B5) 1 Offset 4
+                              MemberDecorate 50(B5) 2 Offset 8
+                              MemberDecorate 50(B5) 3 Offset 16
+                              MemberDecorate 50(B5) 4 Offset 48
+                              MemberDecorate 50(B5) 5 Offset 64
+                              MemberDecorate 50(B5) 6 Offset 96
+                              MemberDecorate 50(B5) 7 Offset 1696
+                              Decorate 50(B5) Block
+                              Decorate 52(b5) DescriptorSet 0
+                              MemberDecorate 88(S2) 0 ColMajor
+                              MemberDecorate 88(S2) 0 Offset 0
+                              MemberDecorate 88(S2) 0 MatrixStride 16
+                              MemberDecorate 88(S2) 1 Offset 64
+                              MemberDecorate 88(S2) 2 Offset 68
+                              MemberDecorate 89(S3) 0 Offset 0
+                              MemberDecorate 90(B4) 0 Offset 0
+                              MemberDecorate 90(B4) 1 Offset 80
+                              Decorate 90(B4) BufferBlock
+                              Decorate 92(b4) DescriptorSet 0
+                              MemberDecorate 93(S2) 0 RowMajor
+                              MemberDecorate 93(S2) 0 Offset 0
+                              MemberDecorate 93(S2) 0 MatrixStride 16
+                              MemberDecorate 93(S2) 1 Offset 64
+                              MemberDecorate 93(S2) 2 Offset 68
+                              MemberDecorate 94(B3) 0 Offset 0
+                              Decorate 94(B3) BufferBlock
+                              Decorate 96(b3) DescriptorSet 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeFloat 16
+               7:             TypeVector 6(float16_t) 2
+               8:             TypeVector 6(float16_t) 3
+               9:             TypeInt 32 0
+              10:      9(int) Constant 2
+              11:             TypeArray 6(float16_t) 10
+           12(S):             TypeStruct 6(float16_t) 7(f16vec2) 8(f16vec3)
+              13:             TypeArray 12(S) 10
+              14:      9(int) Constant 100
+              15:             TypeArray 7(f16vec2) 14
+              16:             TypeRuntimeArray 6(float16_t)
+          17(B2):             TypeStruct 6(float16_t) 7(f16vec2) 8(f16vec3) 11 12(S) 13 15 16
+              18:             TypePointer Uniform 17(B2)
+          19(b2):     18(ptr) Variable Uniform
+              20:             TypeInt 32 1
+              21:     20(int) Constant 0
+              22:             TypeArray 6(float16_t) 10
+           23(S):             TypeStruct 6(float16_t) 7(f16vec2) 8(f16vec3)
+              24:             TypeArray 23(S) 10
+          25(B1):             TypeStruct 6(float16_t) 7(f16vec2) 8(f16vec3) 22 23(S) 24 20(int)
+              26:             TypePointer Uniform 25(B1)
+          27(b1):     26(ptr) Variable Uniform
+              28:             TypePointer Uniform 6(float16_t)
+              32:     20(int) Constant 1
+              33:     20(int) Constant 2
+              34:             TypePointer Uniform 8(f16vec3)
+              37:             TypeFloat 32
+              38:             TypeVector 37(float) 3
+              40:             TypeVector 37(float) 2
+              43:             TypePointer Uniform 7(f16vec2)
+              45:             TypeArray 6(float16_t) 10
+           46(S):             TypeStruct 6(float16_t) 7(f16vec2) 8(f16vec3)
+              47:             TypeArray 46(S) 10
+              48:             TypeArray 7(f16vec2) 14
+              49:             TypeArray 6(float16_t) 14
+          50(B5):             TypeStruct 6(float16_t) 7(f16vec2) 8(f16vec3) 45 46(S) 47 48 49
+              51:             TypePointer Uniform 50(B5)
+          52(b5):     51(ptr) Variable Uniform
+              59:     20(int) Constant 3
+              69:             TypePointer Function 37(float)
+              74:             TypeVector 37(float) 4
+              75:             TypePointer Function 74(fvec4)
+              83:   37(float) Constant 1065353216
+              87:             TypeMatrix 74(fvec4) 4
+          88(S2):             TypeStruct 87 6(float16_t) 37(float)
+          89(S3):             TypeStruct 88(S2)
+          90(B4):             TypeStruct 88(S2) 89(S3)
+              91:             TypePointer Uniform 90(B4)
+          92(b4):     91(ptr) Variable Uniform
+          93(S2):             TypeStruct 87 6(float16_t) 37(float)
+          94(B3):             TypeStruct 93(S2)
+              95:             TypePointer Uniform 94(B3)
+          96(b3):     95(ptr) Variable Uniform
+              97:             TypePointer Uniform 87
+             104:      9(int) Constant 0
+             108:     20(int) Constant 5
+             112:             TypePointer Function 38(fvec3)
+             114:     20(int) Constant 7
+             115:     20(int) Constant 6
+             116:             TypePointer Uniform 20(int)
+             166:   37(float) Constant 1073741824
+             167:   40(fvec2) ConstantComposite 83 166
+             170:   37(float) Constant 1077936128
+         4(main):           2 Function None 3
+               5:             Label
+          70(x0):     69(ptr) Variable Function
+          76(x1):     75(ptr) Variable Function
+         113(v3):    112(ptr) Variable Function
+         135(u3):    112(ptr) Variable Function
+              29:     28(ptr) AccessChain 27(b1) 21
+              30:6(float16_t) Load 29
+              31:     28(ptr) AccessChain 19(b2) 21
+                              Store 31 30
+              35:     34(ptr) AccessChain 19(b2) 33
+              36:  8(f16vec3) Load 35
+              39:   38(fvec3) FConvert 36
+              41:   40(fvec2) VectorShuffle 39 39 0 1
+              42:  7(f16vec2) FConvert 41
+              44:     43(ptr) AccessChain 19(b2) 32
+                              Store 44 42
+              53:     34(ptr) AccessChain 52(b5) 33
+              54:  8(f16vec3) Load 53
+              55:   38(fvec3) FConvert 54
+              56:   40(fvec2) VectorShuffle 55 55 0 1
+              57:  7(f16vec2) FConvert 56
+              58:     43(ptr) AccessChain 19(b2) 32
+                              Store 58 57
+              60:     28(ptr) AccessChain 19(b2) 59 21
+              61:6(float16_t) Load 60
+              62:     28(ptr) AccessChain 19(b2) 59 21
+                              Store 62 61
+              63:     28(ptr) AccessChain 52(b5) 59 32
+              64:6(float16_t) Load 63
+              65:     28(ptr) AccessChain 19(b2) 59 32
+                              Store 65 64
+              66:     43(ptr) AccessChain 19(b2) 32
+              67:  7(f16vec2) Load 66
+              68:     43(ptr) AccessChain 19(b2) 32
+                              Store 68 67
+              71:     28(ptr) AccessChain 27(b1) 21
+              72:6(float16_t) Load 71
+              73:   37(float) FConvert 72
+                              Store 70(x0) 73
+              77:     28(ptr) AccessChain 27(b1) 21
+              78:6(float16_t) Load 77
+              79:   37(float) FConvert 78
+              80:     43(ptr) AccessChain 19(b2) 32
+              81:  7(f16vec2) Load 80
+              82:   40(fvec2) FConvert 81
+              84:   37(float) CompositeExtract 82 0
+              85:   37(float) CompositeExtract 82 1
+              86:   74(fvec4) CompositeConstruct 79 84 85 83
+                              Store 76(x1) 86
+              98:     97(ptr) AccessChain 96(b3) 21 21
+              99:          87 Load 98
+             100:     97(ptr) AccessChain 92(b4) 21 21
+                              Store 100 99
+             101:     43(ptr) AccessChain 19(b2) 32
+             102:  7(f16vec2) Load 101
+             103:   40(fvec2) FConvert 102
+             105:   37(float) CompositeExtract 103 0
+             106:6(float16_t) FConvert 105
+             107:     28(ptr) AccessChain 19(b2) 21
+                              Store 107 106
+             109:     43(ptr) AccessChain 19(b2) 108 32 32
+             110:  7(f16vec2) Load 109
+             111:     43(ptr) AccessChain 19(b2) 32
+                              Store 111 110
+             117:    116(ptr) AccessChain 27(b1) 115
+             118:     20(int) Load 117
+             119:     28(ptr) AccessChain 19(b2) 114 118
+             120:6(float16_t) Load 119
+             121:   37(float) FConvert 120
+             122:    116(ptr) AccessChain 27(b1) 115
+             123:     20(int) Load 122
+             124:     20(int) IAdd 123 32
+             125:     28(ptr) AccessChain 19(b2) 114 124
+             126:6(float16_t) Load 125
+             127:   37(float) FConvert 126
+             128:    116(ptr) AccessChain 27(b1) 115
+             129:     20(int) Load 128
+             130:     20(int) IAdd 129 33
+             131:     28(ptr) AccessChain 19(b2) 114 130
+             132:6(float16_t) Load 131
+             133:   37(float) FConvert 132
+             134:   38(fvec3) CompositeConstruct 121 127 133
+                              Store 113(v3) 134
+             136:    116(ptr) AccessChain 27(b1) 115
+             137:     20(int) Load 136
+             138:     28(ptr) AccessChain 52(b5) 114 137
+             139:6(float16_t) Load 138
+             140:   37(float) FConvert 139
+             141:    116(ptr) AccessChain 27(b1) 115
+             142:     20(int) Load 141
+             143:     20(int) IAdd 142 32
+             144:     28(ptr) AccessChain 52(b5) 114 143
+             145:6(float16_t) Load 144
+             146:   37(float) FConvert 145
+             147:    116(ptr) AccessChain 27(b1) 115
+             148:     20(int) Load 147
+             149:     20(int) IAdd 148 33
+             150:     28(ptr) AccessChain 52(b5) 114 149
+             151:6(float16_t) Load 150
+             152:   37(float) FConvert 151
+             153:   38(fvec3) CompositeConstruct 140 146 152
+                              Store 135(u3) 153
+             154:     43(ptr) AccessChain 19(b2) 115 21
+             155:  7(f16vec2) Load 154
+             156:     43(ptr) AccessChain 19(b2) 115 21
+                              Store 156 155
+             157:     43(ptr) AccessChain 52(b5) 115 32
+             158:  7(f16vec2) Load 157
+             159:     43(ptr) AccessChain 19(b2) 115 32
+                              Store 159 158
+             160:     28(ptr) AccessChain 27(b1) 21
+             161:6(float16_t) Load 160
+             162:     28(ptr) AccessChain 19(b2) 32 104
+                              Store 162 161
+             163:     28(ptr) AccessChain 19(b2) 32 104
+             164:6(float16_t) Load 163
+             165:     28(ptr) AccessChain 19(b2) 21
+                              Store 165 164
+             168:  7(f16vec2) FConvert 167
+             169:     43(ptr) AccessChain 19(b2) 32
+                              Store 169 168
+             171:6(float16_t) FConvert 170
+             172:     28(ptr) AccessChain 19(b2) 21
+                              Store 172 171
+                              Return
+                              FunctionEnd

3rdparty/glslang/Test/baseResults/spv.16bitstorage_Error-int.frag.out

@@ -0,0 +1,91 @@
+spv.16bitstorage_Error-int.frag
+ERROR: 0:54: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:58: 'can't use with structs containing int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:61: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:74: ''[' does not operate on types containing (u)int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:75: 'can't swizzle types containing (u)int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:76: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:76: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:76: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:77: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:77: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform int16_t' (or there is no acceptable conversion)
+ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform int16_t (or there is no acceptable conversion)
+ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int16_t' and a right operand of type ' const int' (or there is no acceptable conversion)
+ERROR: 0:81: 'can't swizzle types containing (u)int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:82: 'can't use with structs containing int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:83: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:84: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:85: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform int16_t' (or there is no acceptable conversion)
+ERROR: 0:87: 'can't use with arrays containing int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:88: '16-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:89: '16-bit array constructors not supported' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:89: '16-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:92: 'Can't construct structure containing 16-bit type' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:93: 'func2' : no matching overloaded function found 
+ERROR: 0:99: '' :  syntax error, unexpected IDENTIFIER
+ERROR: 26 compilation errors.  No code generated.
+
+
+SPIR-V is not generated for failed compile or link

3rdparty/glslang/Test/baseResults/spv.16bitstorage_Error-uint.frag.out

@@ -0,0 +1,91 @@
+spv.16bitstorage_Error-uint.frag
+ERROR: 0:54: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:58: 'can't use with structs containing uint16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:61: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:74: ''[' does not operate on types containing (u)int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:75: 'can't swizzle types containing (u)int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:76: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:76: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:76: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:77: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:77: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform uint16_t' (or there is no acceptable conversion)
+ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform uint16_t (or there is no acceptable conversion)
+ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint16_t' and a right operand of type ' const int' (or there is no acceptable conversion)
+ERROR: 0:81: 'can't swizzle types containing (u)int16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:82: 'can't use with structs containing uint16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:83: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:84: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:85: '(u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform uint16_t' (or there is no acceptable conversion)
+ERROR: 0:87: 'can't use with arrays containing uint16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:88: '16-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:89: '16-bit array constructors not supported' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:89: '16-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:92: 'Can't construct structure containing 16-bit type' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_int16
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int16
+ERROR: 0:93: 'func2' : no matching overloaded function found 
+ERROR: 0:99: '' :  syntax error, unexpected IDENTIFIER
+ERROR: 26 compilation errors.  No code generated.
+
+
+SPIR-V is not generated for failed compile or link

3rdparty/glslang/Test/baseResults/spv.16bitstorage_Error.frag.out

@@ -0,0 +1,99 @@
+spv.16bitstorage_Error.frag
+ERROR: 0:54: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:58: 'can't use with structs containing float16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:61: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:74: ''[' does not operate on types containing float16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:75: 'can't swizzle types containing float16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:76: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:76: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:76: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:77: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:77: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform float16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform float16_t' (or there is no acceptable conversion)
+ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform float16_t (or there is no acceptable conversion)
+ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform float16_t' and a right operand of type ' const float' (or there is no acceptable conversion)
+ERROR: 0:81: 'can't swizzle types containing float16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:82: 'can't use with structs containing float16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:83: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:84: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:85: 'float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform float16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform float16_t' (or there is no acceptable conversion)
+ERROR: 0:87: 'can't use with arrays containing float16' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:88: 'explicit types' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:88: 'explicit types' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:89: '16-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:90: '16-bit array constructors not supported' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:90: '16-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:93: 'Can't construct structure containing 16-bit type' : required extension not requested: Possible extensions include:
+GL_AMD_gpu_shader_half_float
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_float16
+ERROR: 0:94: 'func2' : no matching overloaded function found 
+ERROR: 0:100: '' :  syntax error, unexpected IDENTIFIER
+ERROR: 28 compilation errors.  No code generated.
+
+
+SPIR-V is not generated for failed compile or link

3rdparty/glslang/Test/baseResults/spv.8bitstorage-int.frag.out

@@ -0,0 +1,335 @@
+spv.8bitstorage-int.frag
+// Module Version 10000
+// Generated by (magic number): 80007
+// Id's are bound by 171
+
+                              Capability Shader
+                              Capability Int8
+                              Capability CapabilityStorageBuffer8BitAccess
+                              Capability CapabilityUniformAndStorageBuffer8BitAccess
+                              Extension  "SPV_KHR_8bit_storage"
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main"
+                              ExecutionMode 4 OriginUpperLeft
+                              Source GLSL 450
+                              SourceExtension  "GL_EXT_shader_8bit_storage"
+                              Name 4  "main"
+                              Name 12  "S"
+                              MemberName 12(S) 0  "x"
+                              MemberName 12(S) 1  "y"
+                              MemberName 12(S) 2  "z"
+                              Name 17  "B2"
+                              MemberName 17(B2) 0  "o"
+                              MemberName 17(B2) 1  "p"
+                              MemberName 17(B2) 2  "q"
+                              MemberName 17(B2) 3  "r"
+                              MemberName 17(B2) 4  "u"
+                              MemberName 17(B2) 5  "v"
+                              MemberName 17(B2) 6  "x"
+                              MemberName 17(B2) 7  "w"
+                              Name 19  "b2"
+                              Name 23  "S"
+                              MemberName 23(S) 0  "x"
+                              MemberName 23(S) 1  "y"
+                              MemberName 23(S) 2  "z"
+                              Name 25  "B1"
+                              MemberName 25(B1) 0  "a"
+                              MemberName 25(B1) 1  "b"
+                              MemberName 25(B1) 2  "c"
+                              MemberName 25(B1) 3  "d"
+                              MemberName 25(B1) 4  "g"
+                              MemberName 25(B1) 5  "h"
+                              MemberName 25(B1) 6  "j"
+                              Name 27  "b1"
+                              Name 45  "S"
+                              MemberName 45(S) 0  "x"
+                              MemberName 45(S) 1  "y"
+                              MemberName 45(S) 2  "z"
+                              Name 49  "B5"
+                              MemberName 49(B5) 0  "o"
+                              MemberName 49(B5) 1  "p"
+                              MemberName 49(B5) 2  "q"
+                              MemberName 49(B5) 3  "r"
+                              MemberName 49(B5) 4  "u"
+                              MemberName 49(B5) 5  "v"
+                              MemberName 49(B5) 6  "x"
+                              MemberName 49(B5) 7  "w"
+                              Name 51  "b5"
+                              Name 69  "x0"
+                              Name 75  "x1"
+                              Name 88  "S2"
+                              MemberName 88(S2) 0  "x"
+                              MemberName 88(S2) 1  "y"
+                              MemberName 88(S2) 2  "z"
+                              Name 89  "S3"
+                              MemberName 89(S3) 0  "x"
+                              Name 90  "B4"
+                              MemberName 90(B4) 0  "x"
+                              MemberName 90(B4) 1  "y"
+                              Name 92  "b4"
+                              Name 93  "S2"
+                              MemberName 93(S2) 0  "x"
+                              MemberName 93(S2) 1  "y"
+                              MemberName 93(S2) 2  "z"
+                              Name 94  "B3"
+                              MemberName 94(B3) 0  "x"
+                              Name 96  "b3"
+                              Name 113  "v3"
+                              Name 135  "u3"
+                              Decorate 11 ArrayStride 1
+                              MemberDecorate 12(S) 0 Offset 0
+                              MemberDecorate 12(S) 1 Offset 2
+                              MemberDecorate 12(S) 2 Offset 4
+                              Decorate 13 ArrayStride 8
+                              Decorate 15 ArrayStride 2
+                              Decorate 16 ArrayStride 1
+                              MemberDecorate 17(B2) 0 Offset 0
+                              MemberDecorate 17(B2) 1 Offset 2
+                              MemberDecorate 17(B2) 2 Offset 4
+                              MemberDecorate 17(B2) 3 Offset 7
+                              MemberDecorate 17(B2) 4 Offset 12
+                              MemberDecorate 17(B2) 5 Offset 20
+                              MemberDecorate 17(B2) 6 Offset 36
+                              MemberDecorate 17(B2) 7 Offset 236
+                              Decorate 17(B2) BufferBlock
+                              Decorate 19(b2) DescriptorSet 0
+                              Decorate 22 ArrayStride 16
+                              MemberDecorate 23(S) 0 Offset 0
+                              MemberDecorate 23(S) 1 Offset 2
+                              MemberDecorate 23(S) 2 Offset 4
+                              Decorate 24 ArrayStride 16
+                              MemberDecorate 25(B1) 0 Offset 0
+                              MemberDecorate 25(B1) 1 Offset 2
+                              MemberDecorate 25(B1) 2 Offset 4
+                              MemberDecorate 25(B1) 3 Offset 16
+                              MemberDecorate 25(B1) 4 Offset 48
+                              MemberDecorate 25(B1) 5 Offset 64
+                              MemberDecorate 25(B1) 6 Offset 96
+                              Decorate 25(B1) Block
+                              Decorate 27(b1) DescriptorSet 0
+                              Decorate 44 ArrayStride 16
+                              MemberDecorate 45(S) 0 Offset 0
+                              MemberDecorate 45(S) 1 Offset 2
+                              MemberDecorate 45(S) 2 Offset 4
+                              Decorate 46 ArrayStride 16
+                              Decorate 47 ArrayStride 16
+                              Decorate 48 ArrayStride 16
+                              MemberDecorate 49(B5) 0 Offset 0
+                              MemberDecorate 49(B5) 1 Offset 2
+                              MemberDecorate 49(B5) 2 Offset 4
+                              MemberDecorate 49(B5) 3 Offset 16
+                              MemberDecorate 49(B5) 4 Offset 48
+                              MemberDecorate 49(B5) 5 Offset 64
+                              MemberDecorate 49(B5) 6 Offset 96
+                              MemberDecorate 49(B5) 7 Offset 1696
+                              Decorate 49(B5) Block
+                              Decorate 51(b5) DescriptorSet 0
+                              MemberDecorate 88(S2) 0 ColMajor
+                              MemberDecorate 88(S2) 0 Offset 0
+                              MemberDecorate 88(S2) 0 MatrixStride 16
+                              MemberDecorate 88(S2) 1 Offset 64
+                              MemberDecorate 88(S2) 2 Offset 68
+                              MemberDecorate 89(S3) 0 Offset 0
+                              MemberDecorate 90(B4) 0 Offset 0
+                              MemberDecorate 90(B4) 1 Offset 80
+                              Decorate 90(B4) BufferBlock
+                              Decorate 92(b4) DescriptorSet 0
+                              MemberDecorate 93(S2) 0 RowMajor
+                              MemberDecorate 93(S2) 0 Offset 0
+                              MemberDecorate 93(S2) 0 MatrixStride 16
+                              MemberDecorate 93(S2) 1 Offset 64
+                              MemberDecorate 93(S2) 2 Offset 68
+                              MemberDecorate 94(B3) 0 Offset 0
+                              Decorate 94(B3) BufferBlock
+                              Decorate 96(b3) DescriptorSet 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeInt 8 1
+               7:             TypeVector 6(int8_t) 2
+               8:             TypeVector 6(int8_t) 3
+               9:             TypeInt 32 0
+              10:      9(int) Constant 2
+              11:             TypeArray 6(int8_t) 10
+           12(S):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3)
+              13:             TypeArray 12(S) 10
+              14:      9(int) Constant 100
+              15:             TypeArray 7(i8vec2) 14
+              16:             TypeRuntimeArray 6(int8_t)
+          17(B2):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3) 11 12(S) 13 15 16
+              18:             TypePointer Uniform 17(B2)
+          19(b2):     18(ptr) Variable Uniform
+              20:             TypeInt 32 1
+              21:     20(int) Constant 0
+              22:             TypeArray 6(int8_t) 10
+           23(S):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3)
+              24:             TypeArray 23(S) 10
+          25(B1):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3) 22 23(S) 24 20(int)
+              26:             TypePointer Uniform 25(B1)
+          27(b1):     26(ptr) Variable Uniform
+              28:             TypePointer Uniform 6(int8_t)
+              32:     20(int) Constant 1
+              33:     20(int) Constant 2
+              34:             TypePointer Uniform 8(i8vec3)
+              37:             TypeVector 20(int) 3
+              39:             TypeVector 20(int) 2
+              42:             TypePointer Uniform 7(i8vec2)
+              44:             TypeArray 6(int8_t) 10
+           45(S):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3)
+              46:             TypeArray 45(S) 10
+              47:             TypeArray 7(i8vec2) 14
+              48:             TypeArray 6(int8_t) 14
+          49(B5):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3) 44 45(S) 46 47 48
+              50:             TypePointer Uniform 49(B5)
+          51(b5):     50(ptr) Variable Uniform
+              58:     20(int) Constant 3
+              68:             TypePointer Function 20(int)
+              73:             TypeVector 20(int) 4
+              74:             TypePointer Function 73(ivec4)
+              85:             TypeFloat 32
+              86:             TypeVector 85(float) 4
+              87:             TypeMatrix 86(fvec4) 4
+          88(S2):             TypeStruct 87 6(int8_t) 20(int)
+          89(S3):             TypeStruct 88(S2)
+          90(B4):             TypeStruct 88(S2) 89(S3)
+              91:             TypePointer Uniform 90(B4)
+          92(b4):     91(ptr) Variable Uniform
+          93(S2):             TypeStruct 87 6(int8_t) 20(int)
+          94(B3):             TypeStruct 93(S2)
+              95:             TypePointer Uniform 94(B3)
+          96(b3):     95(ptr) Variable Uniform
+              97:             TypePointer Uniform 87
+             104:      9(int) Constant 0
+             108:     20(int) Constant 5
+             112:             TypePointer Function 37(ivec3)
+             114:     20(int) Constant 7
+             115:     20(int) Constant 6
+             116:             TypePointer Uniform 20(int)
+             166:   39(ivec2) ConstantComposite 32 33
+         4(main):           2 Function None 3
+               5:             Label
+          69(x0):     68(ptr) Variable Function
+          75(x1):     74(ptr) Variable Function
+         113(v3):    112(ptr) Variable Function
+         135(u3):    112(ptr) Variable Function
+              29:     28(ptr) AccessChain 27(b1) 21
+              30:   6(int8_t) Load 29
+              31:     28(ptr) AccessChain 19(b2) 21
+                              Store 31 30
+              35:     34(ptr) AccessChain 19(b2) 33
+              36:   8(i8vec3) Load 35
+              38:   37(ivec3) SConvert 36
+              40:   39(ivec2) VectorShuffle 38 38 0 1
+              41:   7(i8vec2) SConvert 40
+              43:     42(ptr) AccessChain 19(b2) 32
+                              Store 43 41
+              52:     34(ptr) AccessChain 51(b5) 33
+              53:   8(i8vec3) Load 52
+              54:   37(ivec3) SConvert 53
+              55:   39(ivec2) VectorShuffle 54 54 0 1
+              56:   7(i8vec2) SConvert 55
+              57:     42(ptr) AccessChain 19(b2) 32
+                              Store 57 56
+              59:     28(ptr) AccessChain 19(b2) 58 21
+              60:   6(int8_t) Load 59
+              61:     28(ptr) AccessChain 19(b2) 58 21
+                              Store 61 60
+              62:     28(ptr) AccessChain 51(b5) 58 32
+              63:   6(int8_t) Load 62
+              64:     28(ptr) AccessChain 19(b2) 58 32
+                              Store 64 63
+              65:     42(ptr) AccessChain 19(b2) 32
+              66:   7(i8vec2) Load 65
+              67:     42(ptr) AccessChain 19(b2) 32
+                              Store 67 66
+              70:     28(ptr) AccessChain 27(b1) 21
+              71:   6(int8_t) Load 70
+              72:     20(int) SConvert 71
+                              Store 69(x0) 72
+              76:     28(ptr) AccessChain 27(b1) 21
+              77:   6(int8_t) Load 76
+              78:     20(int) SConvert 77
+              79:     42(ptr) AccessChain 19(b2) 32
+              80:   7(i8vec2) Load 79
+              81:   39(ivec2) SConvert 80
+              82:     20(int) CompositeExtract 81 0
+              83:     20(int) CompositeExtract 81 1
+              84:   73(ivec4) CompositeConstruct 78 82 83 32
+                              Store 75(x1) 84
+              98:     97(ptr) AccessChain 96(b3) 21 21
+              99:          87 Load 98
+             100:     97(ptr) AccessChain 92(b4) 21 21
+                              Store 100 99
+             101:     42(ptr) AccessChain 19(b2) 32
+             102:   7(i8vec2) Load 101
+             103:   39(ivec2) SConvert 102
+             105:     20(int) CompositeExtract 103 0
+             106:   6(int8_t) SConvert 105
+             107:     28(ptr) AccessChain 19(b2) 21
+                              Store 107 106
+             109:     42(ptr) AccessChain 19(b2) 108 32 32
+             110:   7(i8vec2) Load 109
+             111:     42(ptr) AccessChain 19(b2) 32
+                              Store 111 110
+             117:    116(ptr) AccessChain 27(b1) 115
+             118:     20(int) Load 117
+             119:     28(ptr) AccessChain 19(b2) 114 118
+             120:   6(int8_t) Load 119
+             121:     20(int) SConvert 120
+             122:    116(ptr) AccessChain 27(b1) 115
+             123:     20(int) Load 122
+             124:     20(int) IAdd 123 32
+             125:     28(ptr) AccessChain 19(b2) 114 124
+             126:   6(int8_t) Load 125
+             127:     20(int) SConvert 126
+             128:    116(ptr) AccessChain 27(b1) 115
+             129:     20(int) Load 128
+             130:     20(int) IAdd 129 33
+             131:     28(ptr) AccessChain 19(b2) 114 130
+             132:   6(int8_t) Load 131
+             133:     20(int) SConvert 132
+             134:   37(ivec3) CompositeConstruct 121 127 133
+                              Store 113(v3) 134
+             136:    116(ptr) AccessChain 27(b1) 115
+             137:     20(int) Load 136
+             138:     28(ptr) AccessChain 51(b5) 114 137
+             139:   6(int8_t) Load 138
+             140:     20(int) SConvert 139
+             141:    116(ptr) AccessChain 27(b1) 115
+             142:     20(int) Load 141
+             143:     20(int) IAdd 142 32
+             144:     28(ptr) AccessChain 51(b5) 114 143
+             145:   6(int8_t) Load 144
+             146:     20(int) SConvert 145
+             147:    116(ptr) AccessChain 27(b1) 115
+             148:     20(int) Load 147
+             149:     20(int) IAdd 148 33
+             150:     28(ptr) AccessChain 51(b5) 114 149
+             151:   6(int8_t) Load 150
+             152:     20(int) SConvert 151
+             153:   37(ivec3) CompositeConstruct 140 146 152
+                              Store 135(u3) 153
+             154:     42(ptr) AccessChain 19(b2) 115 21
+             155:   7(i8vec2) Load 154
+             156:     42(ptr) AccessChain 19(b2) 115 21
+                              Store 156 155
+             157:     42(ptr) AccessChain 51(b5) 115 32
+             158:   7(i8vec2) Load 157
+             159:     42(ptr) AccessChain 19(b2) 115 32
+                              Store 159 158
+             160:     28(ptr) AccessChain 27(b1) 21
+             161:   6(int8_t) Load 160
+             162:     28(ptr) AccessChain 19(b2) 32 104
+                              Store 162 161
+             163:     28(ptr) AccessChain 19(b2) 32 104
+             164:   6(int8_t) Load 163
+             165:     28(ptr) AccessChain 19(b2) 21
+                              Store 165 164
+             167:   7(i8vec2) SConvert 166
+             168:     42(ptr) AccessChain 19(b2) 32
+                              Store 168 167
+             169:   6(int8_t) SConvert 58
+             170:     28(ptr) AccessChain 19(b2) 21
+                              Store 170 169
+                              Return
+                              FunctionEnd

3rdparty/glslang/Test/baseResults/spv.8bitstorage-uint.frag.out

@@ -0,0 +1,337 @@
+spv.8bitstorage-uint.frag
+// Module Version 10000
+// Generated by (magic number): 80007
+// Id's are bound by 173
+
+                              Capability Shader
+                              Capability Int8
+                              Capability CapabilityStorageBuffer8BitAccess
+                              Capability CapabilityUniformAndStorageBuffer8BitAccess
+                              Extension  "SPV_KHR_8bit_storage"
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main"
+                              ExecutionMode 4 OriginUpperLeft
+                              Source GLSL 450
+                              SourceExtension  "GL_EXT_shader_8bit_storage"
+                              Name 4  "main"
+                              Name 12  "S"
+                              MemberName 12(S) 0  "x"
+                              MemberName 12(S) 1  "y"
+                              MemberName 12(S) 2  "z"
+                              Name 17  "B2"
+                              MemberName 17(B2) 0  "o"
+                              MemberName 17(B2) 1  "p"
+                              MemberName 17(B2) 2  "q"
+                              MemberName 17(B2) 3  "r"
+                              MemberName 17(B2) 4  "u"
+                              MemberName 17(B2) 5  "v"
+                              MemberName 17(B2) 6  "x"
+                              MemberName 17(B2) 7  "w"
+                              Name 19  "b2"
+                              Name 23  "S"
+                              MemberName 23(S) 0  "x"
+                              MemberName 23(S) 1  "y"
+                              MemberName 23(S) 2  "z"
+                              Name 25  "B1"
+                              MemberName 25(B1) 0  "a"
+                              MemberName 25(B1) 1  "b"
+                              MemberName 25(B1) 2  "c"
+                              MemberName 25(B1) 3  "d"
+                              MemberName 25(B1) 4  "g"
+                              MemberName 25(B1) 5  "h"
+                              MemberName 25(B1) 6  "j"
+                              Name 27  "b1"
+                              Name 45  "S"
+                              MemberName 45(S) 0  "x"
+                              MemberName 45(S) 1  "y"
+                              MemberName 45(S) 2  "z"
+                              Name 49  "B5"
+                              MemberName 49(B5) 0  "o"
+                              MemberName 49(B5) 1  "p"
+                              MemberName 49(B5) 2  "q"
+                              MemberName 49(B5) 3  "r"
+                              MemberName 49(B5) 4  "u"
+                              MemberName 49(B5) 5  "v"
+                              MemberName 49(B5) 6  "x"
+                              MemberName 49(B5) 7  "w"
+                              Name 51  "b5"
+                              Name 69  "x0"
+                              Name 75  "x1"
+                              Name 89  "S2"
+                              MemberName 89(S2) 0  "x"
+                              MemberName 89(S2) 1  "y"
+                              MemberName 89(S2) 2  "z"
+                              Name 90  "S3"
+                              MemberName 90(S3) 0  "x"
+                              Name 91  "B4"
+                              MemberName 91(B4) 0  "x"
+                              MemberName 91(B4) 1  "y"
+                              Name 93  "b4"
+                              Name 94  "S2"
+                              MemberName 94(S2) 0  "x"
+                              MemberName 94(S2) 1  "y"
+                              MemberName 94(S2) 2  "z"
+                              Name 95  "B3"
+                              MemberName 95(B3) 0  "x"
+                              Name 97  "b3"
+                              Name 114  "v3"
+                              Name 136  "u3"
+                              Decorate 11 ArrayStride 1
+                              MemberDecorate 12(S) 0 Offset 0
+                              MemberDecorate 12(S) 1 Offset 2
+                              MemberDecorate 12(S) 2 Offset 4
+                              Decorate 13 ArrayStride 8
+                              Decorate 15 ArrayStride 2
+                              Decorate 16 ArrayStride 1
+                              MemberDecorate 17(B2) 0 Offset 0
+                              MemberDecorate 17(B2) 1 Offset 2
+                              MemberDecorate 17(B2) 2 Offset 4
+                              MemberDecorate 17(B2) 3 Offset 7
+                              MemberDecorate 17(B2) 4 Offset 12
+                              MemberDecorate 17(B2) 5 Offset 20
+                              MemberDecorate 17(B2) 6 Offset 36
+                              MemberDecorate 17(B2) 7 Offset 236
+                              Decorate 17(B2) BufferBlock
+                              Decorate 19(b2) DescriptorSet 0
+                              Decorate 22 ArrayStride 16
+                              MemberDecorate 23(S) 0 Offset 0
+                              MemberDecorate 23(S) 1 Offset 2
+                              MemberDecorate 23(S) 2 Offset 4
+                              Decorate 24 ArrayStride 16
+                              MemberDecorate 25(B1) 0 Offset 0
+                              MemberDecorate 25(B1) 1 Offset 2
+                              MemberDecorate 25(B1) 2 Offset 4
+                              MemberDecorate 25(B1) 3 Offset 16
+                              MemberDecorate 25(B1) 4 Offset 48
+                              MemberDecorate 25(B1) 5 Offset 64
+                              MemberDecorate 25(B1) 6 Offset 96
+                              Decorate 25(B1) Block
+                              Decorate 27(b1) DescriptorSet 0
+                              Decorate 44 ArrayStride 16
+                              MemberDecorate 45(S) 0 Offset 0
+                              MemberDecorate 45(S) 1 Offset 2
+                              MemberDecorate 45(S) 2 Offset 4
+                              Decorate 46 ArrayStride 16
+                              Decorate 47 ArrayStride 16
+                              Decorate 48 ArrayStride 16
+                              MemberDecorate 49(B5) 0 Offset 0
+                              MemberDecorate 49(B5) 1 Offset 2
+                              MemberDecorate 49(B5) 2 Offset 4
+                              MemberDecorate 49(B5) 3 Offset 16
+                              MemberDecorate 49(B5) 4 Offset 48
+                              MemberDecorate 49(B5) 5 Offset 64
+                              MemberDecorate 49(B5) 6 Offset 96
+                              MemberDecorate 49(B5) 7 Offset 1696
+                              Decorate 49(B5) Block
+                              Decorate 51(b5) DescriptorSet 0
+                              MemberDecorate 89(S2) 0 ColMajor
+                              MemberDecorate 89(S2) 0 Offset 0
+                              MemberDecorate 89(S2) 0 MatrixStride 16
+                              MemberDecorate 89(S2) 1 Offset 64
+                              MemberDecorate 89(S2) 2 Offset 68
+                              MemberDecorate 90(S3) 0 Offset 0
+                              MemberDecorate 91(B4) 0 Offset 0
+                              MemberDecorate 91(B4) 1 Offset 80
+                              Decorate 91(B4) BufferBlock
+                              Decorate 93(b4) DescriptorSet 0
+                              MemberDecorate 94(S2) 0 RowMajor
+                              MemberDecorate 94(S2) 0 Offset 0
+                              MemberDecorate 94(S2) 0 MatrixStride 16
+                              MemberDecorate 94(S2) 1 Offset 64
+                              MemberDecorate 94(S2) 2 Offset 68
+                              MemberDecorate 95(B3) 0 Offset 0
+                              Decorate 95(B3) BufferBlock
+                              Decorate 97(b3) DescriptorSet 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeInt 8 0
+               7:             TypeVector 6(int8_t) 2
+               8:             TypeVector 6(int8_t) 3
+               9:             TypeInt 32 0
+              10:      9(int) Constant 2
+              11:             TypeArray 6(int8_t) 10
+           12(S):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3)
+              13:             TypeArray 12(S) 10
+              14:      9(int) Constant 100
+              15:             TypeArray 7(i8vec2) 14
+              16:             TypeRuntimeArray 6(int8_t)
+          17(B2):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3) 11 12(S) 13 15 16
+              18:             TypePointer Uniform 17(B2)
+          19(b2):     18(ptr) Variable Uniform
+              20:             TypeInt 32 1
+              21:     20(int) Constant 0
+              22:             TypeArray 6(int8_t) 10
+           23(S):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3)
+              24:             TypeArray 23(S) 10
+          25(B1):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3) 22 23(S) 24 9(int)
+              26:             TypePointer Uniform 25(B1)
+          27(b1):     26(ptr) Variable Uniform
+              28:             TypePointer Uniform 6(int8_t)
+              32:     20(int) Constant 1
+              33:     20(int) Constant 2
+              34:             TypePointer Uniform 8(i8vec3)
+              37:             TypeVector 9(int) 3
+              39:             TypeVector 9(int) 2
+              42:             TypePointer Uniform 7(i8vec2)
+              44:             TypeArray 6(int8_t) 10
+           45(S):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3)
+              46:             TypeArray 45(S) 10
+              47:             TypeArray 7(i8vec2) 14
+              48:             TypeArray 6(int8_t) 14
+          49(B5):             TypeStruct 6(int8_t) 7(i8vec2) 8(i8vec3) 44 45(S) 46 47 48
+              50:             TypePointer Uniform 49(B5)
+          51(b5):     50(ptr) Variable Uniform
+              58:     20(int) Constant 3
+              68:             TypePointer Function 9(int)
+              73:             TypeVector 9(int) 4
+              74:             TypePointer Function 73(ivec4)
+              82:      9(int) Constant 1
+              86:             TypeFloat 32
+              87:             TypeVector 86(float) 4
+              88:             TypeMatrix 87(fvec4) 4
+          89(S2):             TypeStruct 88 6(int8_t) 9(int)
+          90(S3):             TypeStruct 89(S2)
+          91(B4):             TypeStruct 89(S2) 90(S3)
+              92:             TypePointer Uniform 91(B4)
+          93(b4):     92(ptr) Variable Uniform
+          94(S2):             TypeStruct 88 6(int8_t) 9(int)
+          95(B3):             TypeStruct 94(S2)
+              96:             TypePointer Uniform 95(B3)
+          97(b3):     96(ptr) Variable Uniform
+              98:             TypePointer Uniform 88
+             105:      9(int) Constant 0
+             109:     20(int) Constant 5
+             113:             TypePointer Function 37(ivec3)
+             115:     20(int) Constant 7
+             116:     20(int) Constant 6
+             117:             TypePointer Uniform 9(int)
+             167:   39(ivec2) ConstantComposite 82 10
+             170:      9(int) Constant 3
+         4(main):           2 Function None 3
+               5:             Label
+          69(x0):     68(ptr) Variable Function
+          75(x1):     74(ptr) Variable Function
+         114(v3):    113(ptr) Variable Function
+         136(u3):    113(ptr) Variable Function
+              29:     28(ptr) AccessChain 27(b1) 21
+              30:   6(int8_t) Load 29
+              31:     28(ptr) AccessChain 19(b2) 21
+                              Store 31 30
+              35:     34(ptr) AccessChain 19(b2) 33
+              36:   8(i8vec3) Load 35
+              38:   37(ivec3) UConvert 36
+              40:   39(ivec2) VectorShuffle 38 38 0 1
+              41:   7(i8vec2) UConvert 40
+              43:     42(ptr) AccessChain 19(b2) 32
+                              Store 43 41
+              52:     34(ptr) AccessChain 51(b5) 33
+              53:   8(i8vec3) Load 52
+              54:   37(ivec3) UConvert 53
+              55:   39(ivec2) VectorShuffle 54 54 0 1
+              56:   7(i8vec2) UConvert 55
+              57:     42(ptr) AccessChain 19(b2) 32
+                              Store 57 56
+              59:     28(ptr) AccessChain 19(b2) 58 21
+              60:   6(int8_t) Load 59
+              61:     28(ptr) AccessChain 19(b2) 58 21
+                              Store 61 60
+              62:     28(ptr) AccessChain 51(b5) 58 32
+              63:   6(int8_t) Load 62
+              64:     28(ptr) AccessChain 19(b2) 58 32
+                              Store 64 63
+              65:     42(ptr) AccessChain 19(b2) 32
+              66:   7(i8vec2) Load 65
+              67:     42(ptr) AccessChain 19(b2) 32
+                              Store 67 66
+              70:     28(ptr) AccessChain 27(b1) 21
+              71:   6(int8_t) Load 70
+              72:      9(int) UConvert 71
+                              Store 69(x0) 72
+              76:     28(ptr) AccessChain 27(b1) 21
+              77:   6(int8_t) Load 76
+              78:      9(int) UConvert 77
+              79:     42(ptr) AccessChain 19(b2) 32
+              80:   7(i8vec2) Load 79
+              81:   39(ivec2) UConvert 80
+              83:      9(int) CompositeExtract 81 0
+              84:      9(int) CompositeExtract 81 1
+              85:   73(ivec4) CompositeConstruct 78 83 84 82
+                              Store 75(x1) 85
+              99:     98(ptr) AccessChain 97(b3) 21 21
+             100:          88 Load 99
+             101:     98(ptr) AccessChain 93(b4) 21 21
+                              Store 101 100
+             102:     42(ptr) AccessChain 19(b2) 32
+             103:   7(i8vec2) Load 102
+             104:   39(ivec2) UConvert 103
+             106:      9(int) CompositeExtract 104 0
+             107:   6(int8_t) UConvert 106
+             108:     28(ptr) AccessChain 19(b2) 21
+                              Store 108 107
+             110:     42(ptr) AccessChain 19(b2) 109 32 32
+             111:   7(i8vec2) Load 110
+             112:     42(ptr) AccessChain 19(b2) 32
+                              Store 112 111
+             118:    117(ptr) AccessChain 27(b1) 116
+             119:      9(int) Load 118
+             120:     28(ptr) AccessChain 19(b2) 115 119
+             121:   6(int8_t) Load 120
+             122:      9(int) UConvert 121
+             123:    117(ptr) AccessChain 27(b1) 116
+             124:      9(int) Load 123
+             125:      9(int) IAdd 124 82
+             126:     28(ptr) AccessChain 19(b2) 115 125
+             127:   6(int8_t) Load 126
+             128:      9(int) UConvert 127
+             129:    117(ptr) AccessChain 27(b1) 116
+             130:      9(int) Load 129
+             131:      9(int) IAdd 130 10
+             132:     28(ptr) AccessChain 19(b2) 115 131
+             133:   6(int8_t) Load 132
+             134:      9(int) UConvert 133
+             135:   37(ivec3) CompositeConstruct 122 128 134
+                              Store 114(v3) 135
+             137:    117(ptr) AccessChain 27(b1) 116
+             138:      9(int) Load 137
+             139:     28(ptr) AccessChain 51(b5) 115 138
+             140:   6(int8_t) Load 139
+             141:      9(int) UConvert 140
+             142:    117(ptr) AccessChain 27(b1) 116
+             143:      9(int) Load 142
+             144:      9(int) IAdd 143 82
+             145:     28(ptr) AccessChain 51(b5) 115 144
+             146:   6(int8_t) Load 145
+             147:      9(int) UConvert 146
+             148:    117(ptr) AccessChain 27(b1) 116
+             149:      9(int) Load 148
+             150:      9(int) IAdd 149 10
+             151:     28(ptr) AccessChain 51(b5) 115 150
+             152:   6(int8_t) Load 151
+             153:      9(int) UConvert 152
+             154:   37(ivec3) CompositeConstruct 141 147 153
+                              Store 136(u3) 154
+             155:     42(ptr) AccessChain 19(b2) 116 21
+             156:   7(i8vec2) Load 155
+             157:     42(ptr) AccessChain 19(b2) 116 21
+                              Store 157 156
+             158:     42(ptr) AccessChain 51(b5) 116 32
+             159:   7(i8vec2) Load 158
+             160:     42(ptr) AccessChain 19(b2) 116 32
+                              Store 160 159
+             161:     28(ptr) AccessChain 27(b1) 21
+             162:   6(int8_t) Load 161
+             163:     28(ptr) AccessChain 19(b2) 32 105
+                              Store 163 162
+             164:     28(ptr) AccessChain 19(b2) 32 105
+             165:   6(int8_t) Load 164
+             166:     28(ptr) AccessChain 19(b2) 21
+                              Store 166 165
+             168:   7(i8vec2) UConvert 167
+             169:     42(ptr) AccessChain 19(b2) 32
+                              Store 169 168
+             171:   6(int8_t) UConvert 170
+             172:     28(ptr) AccessChain 19(b2) 21
+                              Store 172 171
+                              Return
+                              FunctionEnd

3rdparty/glslang/Test/baseResults/spv.8bitstorage_Error-int.frag.out

@@ -0,0 +1,71 @@
+spv.8bitstorage_Error-int.frag
+ERROR: 0:54: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:58: 'can't use with structs containing int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:61: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:74: ''[' does not operate on types containing (u)int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:75: 'can't swizzle types containing (u)int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:76: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:76: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:76: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:77: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:77: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int8_t' and a right operand of type 'layout( column_major std140 offset=0) uniform int8_t' (or there is no acceptable conversion)
+ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform int8_t (or there is no acceptable conversion)
+ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int8_t' and a right operand of type ' const int' (or there is no acceptable conversion)
+ERROR: 0:81: 'can't swizzle types containing (u)int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:82: 'can't use with structs containing int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:83: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:84: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:85: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int8_t' and a right operand of type 'layout( column_major std140 offset=0) uniform int8_t' (or there is no acceptable conversion)
+ERROR: 0:87: 'can't use with arrays containing int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:88: '8-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:89: '8-bit array constructors not supported' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:89: '8-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:92: 'Can't construct structure containing 8-bit type' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:93: 'func2' : no matching overloaded function found 
+ERROR: 0:99: '' :  syntax error, unexpected IDENTIFIER
+ERROR: 26 compilation errors.  No code generated.
+
+
+SPIR-V is not generated for failed compile or link

3rdparty/glslang/Test/baseResults/spv.8bitstorage_Error-uint.frag.out

@@ -0,0 +1,71 @@
+spv.8bitstorage_Error-uint.frag
+ERROR: 0:54: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:58: 'can't use with structs containing uint8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:61: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:74: ''[' does not operate on types containing (u)int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:75: 'can't swizzle types containing (u)int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:76: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:76: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:76: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:77: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:77: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint8_t' and a right operand of type 'layout( column_major std140 offset=0) uniform uint8_t' (or there is no acceptable conversion)
+ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform uint8_t (or there is no acceptable conversion)
+ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint8_t' and a right operand of type ' const int' (or there is no acceptable conversion)
+ERROR: 0:81: 'can't swizzle types containing (u)int8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:82: 'can't use with structs containing uint8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:83: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:84: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:85: '(u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint8_t' and a right operand of type 'layout( column_major std140 offset=0) uniform uint8_t' (or there is no acceptable conversion)
+ERROR: 0:87: 'can't use with arrays containing uint8' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:88: '8-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:89: '8-bit array constructors not supported' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:89: '8-bit vector constructors only take vector types' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:92: 'Can't construct structure containing 8-bit type' : required extension not requested: Possible extensions include:
+GL_KHX_shader_explicit_arithmetic_types
+GL_KHX_shader_explicit_arithmetic_types_int8
+ERROR: 0:93: 'func2' : no matching overloaded function found 
+ERROR: 0:99: '' :  syntax error, unexpected IDENTIFIER
+ERROR: 26 compilation errors.  No code generated.
+
+
+SPIR-V is not generated for failed compile or link

3rdparty/glslang/Test/baseResults/spv.float32.frag.out

@@ -1,7 +1,7 @@
 spv.float32.frag
 // Module Version 10300
 // Generated by (magic number): 80007
-// Id's are bound by 530
+// Id's are bound by 533
 
                               Capability Shader
                               Capability Float16
@@ -13,7 +13,7 @@ spv.float32.frag
                               Capability InterpolationFunction
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 468
+                              EntryPoint Fragment 4  "main" 471
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
                               SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
@@ -48,81 +48,81 @@ spv.float32.frag
                               Name 189  "i16v"
                               Name 195  "i32v"
                               Name 201  "i64v"
-                              Name 204  "u8v"
-                              Name 210  "u16v"
-                              Name 215  "u32v"
-                              Name 221  "u64v"
-                              Name 226  "f32v2"
-                              Name 227  "f32v1"
-                              Name 259  "f32v2"
-                              Name 260  "f32v1"
-                              Name 276  "f32v2"
-                              Name 277  "f32v1"
-                              Name 298  "f32"
-                              Name 302  "f32v3"
-                              Name 342  "bv"
-                              Name 363  "b"
-                              Name 373  "iv"
-                              Name 374  "ResType"
-                              Name 381  "f32"
-                              Name 382  "f32v1"
-                              Name 386  "f32v2"
-                              Name 392  "f32v3"
-                              Name 411  "f32m3"
-                              Name 412  "f32m1"
-                              Name 414  "f32m2"
-                              Name 423  "f32v1"
-                              Name 425  "f32v2"
-                              Name 430  "f32m4"
-                              Name 433  "f32"
-                              Name 436  "f32m5"
-                              Name 441  "f32m6"
-                              Name 442  "f32m7"
-                              Name 445  "bv"
-                              Name 446  "f32v1"
-                              Name 448  "f32v2"
-                              Name 466  "f32v"
-                              Name 468  "if32v"
-                              Name 517  "S"
-                              MemberName 517(S) 0  "x"
-                              MemberName 517(S) 1  "y"
-                              MemberName 517(S) 2  "z"
-                              Name 519  "B1"
-                              MemberName 519(B1) 0  "a"
-                              MemberName 519(B1) 1  "b"
-                              MemberName 519(B1) 2  "c"
-                              MemberName 519(B1) 3  "d"
-                              MemberName 519(B1) 4  "e"
-                              MemberName 519(B1) 5  "f"
-                              MemberName 519(B1) 6  "g"
-                              MemberName 519(B1) 7  "h"
-                              Name 521  ""
-                              Name 522  "sf16"
-                              Name 523  "sf"
-                              Name 524  "sd"
-                              Decorate 515 ArrayStride 16
-                              Decorate 516 ArrayStride 32
-                              MemberDecorate 517(S) 0 Offset 0
-                              MemberDecorate 517(S) 1 Offset 8
-                              MemberDecorate 517(S) 2 Offset 16
-                              Decorate 518 ArrayStride 32
-                              MemberDecorate 519(B1) 0 Offset 0
-                              MemberDecorate 519(B1) 1 Offset 8
-                              MemberDecorate 519(B1) 2 Offset 16
-                              MemberDecorate 519(B1) 3 Offset 32
-                              MemberDecorate 519(B1) 4 ColMajor
-                              MemberDecorate 519(B1) 4 Offset 64
-                              MemberDecorate 519(B1) 4 MatrixStride 16
-                              MemberDecorate 519(B1) 5 ColMajor
-                              MemberDecorate 519(B1) 5 Offset 96
-                              MemberDecorate 519(B1) 5 MatrixStride 16
-                              MemberDecorate 519(B1) 6 Offset 160
-                              MemberDecorate 519(B1) 7 Offset 192
-                              Decorate 519(B1) Block
-                              Decorate 521 DescriptorSet 0
-                              Decorate 522(sf16) SpecId 100
-                              Decorate 523(sf) SpecId 101
-                              Decorate 524(sd) SpecId 102
+                              Name 207  "u8v"
+                              Name 213  "u16v"
+                              Name 218  "u32v"
+                              Name 224  "u64v"
+                              Name 229  "f32v2"
+                              Name 230  "f32v1"
+                              Name 262  "f32v2"
+                              Name 263  "f32v1"
+                              Name 279  "f32v2"
+                              Name 280  "f32v1"
+                              Name 301  "f32"
+                              Name 305  "f32v3"
+                              Name 345  "bv"
+                              Name 366  "b"
+                              Name 376  "iv"
+                              Name 377  "ResType"
+                              Name 384  "f32"
+                              Name 385  "f32v1"
+                              Name 389  "f32v2"
+                              Name 395  "f32v3"
+                              Name 414  "f32m3"
+                              Name 415  "f32m1"
+                              Name 417  "f32m2"
+                              Name 426  "f32v1"
+                              Name 428  "f32v2"
+                              Name 433  "f32m4"
+                              Name 436  "f32"
+                              Name 439  "f32m5"
+                              Name 444  "f32m6"
+                              Name 445  "f32m7"
+                              Name 448  "bv"
+                              Name 449  "f32v1"
+                              Name 451  "f32v2"
+                              Name 469  "f32v"
+                              Name 471  "if32v"
+                              Name 520  "S"
+                              MemberName 520(S) 0  "x"
+                              MemberName 520(S) 1  "y"
+                              MemberName 520(S) 2  "z"
+                              Name 522  "B1"
+                              MemberName 522(B1) 0  "a"
+                              MemberName 522(B1) 1  "b"
+                              MemberName 522(B1) 2  "c"
+                              MemberName 522(B1) 3  "d"
+                              MemberName 522(B1) 4  "e"
+                              MemberName 522(B1) 5  "f"
+                              MemberName 522(B1) 6  "g"
+                              MemberName 522(B1) 7  "h"
+                              Name 524  ""
+                              Name 525  "sf16"
+                              Name 526  "sf"
+                              Name 527  "sd"
+                              Decorate 518 ArrayStride 16
+                              Decorate 519 ArrayStride 32
+                              MemberDecorate 520(S) 0 Offset 0
+                              MemberDecorate 520(S) 1 Offset 8
+                              MemberDecorate 520(S) 2 Offset 16
+                              Decorate 521 ArrayStride 32
+                              MemberDecorate 522(B1) 0 Offset 0
+                              MemberDecorate 522(B1) 1 Offset 8
+                              MemberDecorate 522(B1) 2 Offset 16
+                              MemberDecorate 522(B1) 3 Offset 32
+                              MemberDecorate 522(B1) 4 ColMajor
+                              MemberDecorate 522(B1) 4 Offset 64
+                              MemberDecorate 522(B1) 4 MatrixStride 16
+                              MemberDecorate 522(B1) 5 ColMajor
+                              MemberDecorate 522(B1) 5 Offset 96
+                              MemberDecorate 522(B1) 5 MatrixStride 16
+                              MemberDecorate 522(B1) 6 Offset 160
+                              MemberDecorate 522(B1) 7 Offset 192
+                              Decorate 522(B1) Block
+                              Decorate 524 DescriptorSet 0
+                              Decorate 525(sf16) SpecId 100
+                              Decorate 526(sf) SpecId 101
+                              Decorate 527(sd) SpecId 102
                2:             TypeVoid
                3:             TypeFunction 2
               26:             TypeFloat 32
@@ -166,47 +166,50 @@ spv.float32.frag
              198:             TypeInt 64 1
              199:             TypeVector 198(int64_t) 3
              200:             TypePointer Function 199(i64vec3)
-             207:             TypeInt 16 0
-             208:             TypeVector 207(int16_t) 3
-             209:             TypePointer Function 208(i16vec3)
-             213:             TypeVector 31(int) 3
-             214:             TypePointer Function 213(ivec3)
-             218:             TypeInt 64 0
-             219:             TypeVector 218(int64_t) 3
-             220:             TypePointer Function 219(i64vec3)
-             224:             TypeVector 26(float) 4
-             225:             TypePointer Function 224(fvec4)
-    374(ResType):             TypeStruct 153(fvec3) 193(ivec3)
-             409:             TypeMatrix 153(fvec3) 2
-             410:             TypePointer Function 409
-             428:             TypeMatrix 27(fvec2) 3
-             429:             TypePointer Function 428
-             434:             TypeMatrix 153(fvec3) 3
-             435:             TypePointer Function 434
-             439:             TypeMatrix 224(fvec4) 4
-             440:             TypePointer Function 439
-             467:             TypePointer Input 153(fvec3)
-      468(if32v):    467(ptr) Variable Input
-             469:             TypePointer Input 26(float)
-             506:    192(int) Constant 1
-             511:   26(float) Constant 1056964608
-             512:   27(fvec2) ConstantComposite 511 511
-             514:     31(int) Constant 2
-             515:             TypeArray 26(float) 514
-             516:             TypeArray 409 514
-          517(S):             TypeStruct 26(float) 27(fvec2) 153(fvec3)
-             518:             TypeArray 517(S) 514
-         519(B1):             TypeStruct 26(float) 27(fvec2) 153(fvec3) 515 409 516 517(S) 518
-             520:             TypePointer Uniform 519(B1)
-             521:    520(ptr) Variable Uniform
-       522(sf16):172(float16_t) SpecConstant 12288
-         523(sf):   26(float) SpecConstant 1048576000
-         524(sd):149(float64_t) SpecConstant 0 1071644672
-             525:   26(float) SpecConstantOp 115 522(sf16)
-             526:   26(float) SpecConstantOp 115 522(sf16)
-             527:149(float64_t) SpecConstantOp 115 526
-             528:172(float16_t) SpecConstantOp 115 523(sf)
-             529:172(float16_t) SpecConstantOp 115 524(sd)
+             204:             TypeInt 8 0
+             205:             TypeVector 204(int8_t) 3
+             206:             TypePointer Function 205(i8vec3)
+             210:             TypeInt 16 0
+             211:             TypeVector 210(int16_t) 3
+             212:             TypePointer Function 211(i16vec3)
+             216:             TypeVector 31(int) 3
+             217:             TypePointer Function 216(ivec3)
+             221:             TypeInt 64 0
+             222:             TypeVector 221(int64_t) 3
+             223:             TypePointer Function 222(i64vec3)
+             227:             TypeVector 26(float) 4
+             228:             TypePointer Function 227(fvec4)
+    377(ResType):             TypeStruct 153(fvec3) 193(ivec3)
+             412:             TypeMatrix 153(fvec3) 2
+             413:             TypePointer Function 412
+             431:             TypeMatrix 27(fvec2) 3
+             432:             TypePointer Function 431
+             437:             TypeMatrix 153(fvec3) 3
+             438:             TypePointer Function 437
+             442:             TypeMatrix 227(fvec4) 4
+             443:             TypePointer Function 442
+             470:             TypePointer Input 153(fvec3)
+      471(if32v):    470(ptr) Variable Input
+             472:             TypePointer Input 26(float)
+             509:    192(int) Constant 1
+             514:   26(float) Constant 1056964608
+             515:   27(fvec2) ConstantComposite 514 514
+             517:     31(int) Constant 2
+             518:             TypeArray 26(float) 517
+             519:             TypeArray 412 517
+          520(S):             TypeStruct 26(float) 27(fvec2) 153(fvec3)
+             521:             TypeArray 520(S) 517
+         522(B1):             TypeStruct 26(float) 27(fvec2) 153(fvec3) 518 412 519 520(S) 521
+             523:             TypePointer Uniform 522(B1)
+             524:    523(ptr) Variable Uniform
+       525(sf16):172(float16_t) SpecConstant 12288
+         526(sf):   26(float) SpecConstant 1048576000
+         527(sd):149(float64_t) SpecConstant 0 1071644672
+             528:   26(float) SpecConstantOp 115 525(sf16)
+             529:   26(float) SpecConstantOp 115 525(sf16)
+             530:149(float64_t) SpecConstantOp 115 529
+             531:172(float16_t) SpecConstantOp 115 526(sf)
+             532:172(float16_t) SpecConstantOp 115 527(sd)
          4(main):           2 Function None 3
                5:             Label
                               Return
@@ -363,10 +366,10 @@ spv.float32.frag
        189(i16v):    188(ptr) Variable Function
        195(i32v):    194(ptr) Variable Function
        201(i64v):    200(ptr) Variable Function
-        204(u8v):    182(ptr) Variable Function
-       210(u16v):    209(ptr) Variable Function
-       215(u32v):    214(ptr) Variable Function
-       221(u64v):    220(ptr) Variable Function
+        207(u8v):    206(ptr) Variable Function
+       213(u16v):    212(ptr) Variable Function
+       218(u32v):    217(ptr) Variable Function
+       224(u64v):    223(ptr) Variable Function
              156:  153(fvec3) Load 155(f32v)
              157:150(f64vec3) FConvert 156
                               Store 152(f64v) 157
@@ -400,401 +403,401 @@ spv.float32.frag
              202:  153(fvec3) Load 155(f32v)
              203:199(i64vec3) ConvertFToS 202
                               Store 201(i64v) 203
-             205:  153(fvec3) Load 155(f32v)
-             206: 181(i8vec3) ConvertFToS 205
-                              Store 204(u8v) 206
-             211:  153(fvec3) Load 155(f32v)
-             212:208(i16vec3) ConvertFToU 211
-                              Store 210(u16v) 212
-             216:  153(fvec3) Load 155(f32v)
-             217:  213(ivec3) ConvertFToU 216
-                              Store 215(u32v) 217
-             222:  153(fvec3) Load 155(f32v)
-             223:219(i64vec3) ConvertFToU 222
-                              Store 221(u64v) 223
+             208:  153(fvec3) Load 155(f32v)
+             209: 205(i8vec3) ConvertFToU 208
+                              Store 207(u8v) 209
+             214:  153(fvec3) Load 155(f32v)
+             215:211(i16vec3) ConvertFToU 214
+                              Store 213(u16v) 215
+             219:  153(fvec3) Load 155(f32v)
+             220:  216(ivec3) ConvertFToU 219
+                              Store 218(u32v) 220
+             225:  153(fvec3) Load 155(f32v)
+             226:222(i64vec3) ConvertFToU 225
+                              Store 224(u64v) 226
                               Return
                               FunctionEnd
 12(builtinAngleTrigFuncs():           2 Function None 3
               13:             Label
-      226(f32v2):    225(ptr) Variable Function
-      227(f32v1):    225(ptr) Variable Function
-             228:  224(fvec4) Load 227(f32v1)
-             229:  224(fvec4) ExtInst 1(GLSL.std.450) 11(Radians) 228
-                              Store 226(f32v2) 229
-             230:  224(fvec4) Load 227(f32v1)
-             231:  224(fvec4) ExtInst 1(GLSL.std.450) 12(Degrees) 230
-                              Store 226(f32v2) 231
-             232:  224(fvec4) Load 227(f32v1)
-             233:  224(fvec4) ExtInst 1(GLSL.std.450) 13(Sin) 232
-                              Store 226(f32v2) 233
-             234:  224(fvec4) Load 227(f32v1)
-             235:  224(fvec4) ExtInst 1(GLSL.std.450) 14(Cos) 234
-                              Store 226(f32v2) 235
-             236:  224(fvec4) Load 227(f32v1)
-             237:  224(fvec4) ExtInst 1(GLSL.std.450) 15(Tan) 236
-                              Store 226(f32v2) 237
-             238:  224(fvec4) Load 227(f32v1)
-             239:  224(fvec4) ExtInst 1(GLSL.std.450) 16(Asin) 238
-                              Store 226(f32v2) 239
-             240:  224(fvec4) Load 227(f32v1)
-             241:  224(fvec4) ExtInst 1(GLSL.std.450) 17(Acos) 240
-                              Store 226(f32v2) 241
-             242:  224(fvec4) Load 227(f32v1)
-             243:  224(fvec4) Load 226(f32v2)
-             244:  224(fvec4) ExtInst 1(GLSL.std.450) 25(Atan2) 242 243
-                              Store 226(f32v2) 244
-             245:  224(fvec4) Load 227(f32v1)
-             246:  224(fvec4) ExtInst 1(GLSL.std.450) 18(Atan) 245
-                              Store 226(f32v2) 246
-             247:  224(fvec4) Load 227(f32v1)
-             248:  224(fvec4) ExtInst 1(GLSL.std.450) 19(Sinh) 247
-                              Store 226(f32v2) 248
-             249:  224(fvec4) Load 227(f32v1)
-             250:  224(fvec4) ExtInst 1(GLSL.std.450) 20(Cosh) 249
-                              Store 226(f32v2) 250
-             251:  224(fvec4) Load 227(f32v1)
-             252:  224(fvec4) ExtInst 1(GLSL.std.450) 21(Tanh) 251
-                              Store 226(f32v2) 252
-             253:  224(fvec4) Load 227(f32v1)
-             254:  224(fvec4) ExtInst 1(GLSL.std.450) 22(Asinh) 253
-                              Store 226(f32v2) 254
-             255:  224(fvec4) Load 227(f32v1)
-             256:  224(fvec4) ExtInst 1(GLSL.std.450) 23(Acosh) 255
-                              Store 226(f32v2) 256
-             257:  224(fvec4) Load 227(f32v1)
-             258:  224(fvec4) ExtInst 1(GLSL.std.450) 24(Atanh) 257
-                              Store 226(f32v2) 258
+      229(f32v2):    228(ptr) Variable Function
+      230(f32v1):    228(ptr) Variable Function
+             231:  227(fvec4) Load 230(f32v1)
+             232:  227(fvec4) ExtInst 1(GLSL.std.450) 11(Radians) 231
+                              Store 229(f32v2) 232
+             233:  227(fvec4) Load 230(f32v1)
+             234:  227(fvec4) ExtInst 1(GLSL.std.450) 12(Degrees) 233
+                              Store 229(f32v2) 234
+             235:  227(fvec4) Load 230(f32v1)
+             236:  227(fvec4) ExtInst 1(GLSL.std.450) 13(Sin) 235
+                              Store 229(f32v2) 236
+             237:  227(fvec4) Load 230(f32v1)
+             238:  227(fvec4) ExtInst 1(GLSL.std.450) 14(Cos) 237
+                              Store 229(f32v2) 238
+             239:  227(fvec4) Load 230(f32v1)
+             240:  227(fvec4) ExtInst 1(GLSL.std.450) 15(Tan) 239
+                              Store 229(f32v2) 240
+             241:  227(fvec4) Load 230(f32v1)
+             242:  227(fvec4) ExtInst 1(GLSL.std.450) 16(Asin) 241
+                              Store 229(f32v2) 242
+             243:  227(fvec4) Load 230(f32v1)
+             244:  227(fvec4) ExtInst 1(GLSL.std.450) 17(Acos) 243
+                              Store 229(f32v2) 244
+             245:  227(fvec4) Load 230(f32v1)
+             246:  227(fvec4) Load 229(f32v2)
+             247:  227(fvec4) ExtInst 1(GLSL.std.450) 25(Atan2) 245 246
+                              Store 229(f32v2) 247
+             248:  227(fvec4) Load 230(f32v1)
+             249:  227(fvec4) ExtInst 1(GLSL.std.450) 18(Atan) 248
+                              Store 229(f32v2) 249
+             250:  227(fvec4) Load 230(f32v1)
+             251:  227(fvec4) ExtInst 1(GLSL.std.450) 19(Sinh) 250
+                              Store 229(f32v2) 251
+             252:  227(fvec4) Load 230(f32v1)
+             253:  227(fvec4) ExtInst 1(GLSL.std.450) 20(Cosh) 252
+                              Store 229(f32v2) 253
+             254:  227(fvec4) Load 230(f32v1)
+             255:  227(fvec4) ExtInst 1(GLSL.std.450) 21(Tanh) 254
+                              Store 229(f32v2) 255
+             256:  227(fvec4) Load 230(f32v1)
+             257:  227(fvec4) ExtInst 1(GLSL.std.450) 22(Asinh) 256
+                              Store 229(f32v2) 257
+             258:  227(fvec4) Load 230(f32v1)
+             259:  227(fvec4) ExtInst 1(GLSL.std.450) 23(Acosh) 258
+                              Store 229(f32v2) 259
+             260:  227(fvec4) Load 230(f32v1)
+             261:  227(fvec4) ExtInst 1(GLSL.std.450) 24(Atanh) 260
+                              Store 229(f32v2) 261
                               Return
                               FunctionEnd
 14(builtinExpFuncs():           2 Function None 3
               15:             Label
-      259(f32v2):     28(ptr) Variable Function
-      260(f32v1):     28(ptr) Variable Function
-             261:   27(fvec2) Load 260(f32v1)
-             262:   27(fvec2) Load 259(f32v2)
-             263:   27(fvec2) ExtInst 1(GLSL.std.450) 26(Pow) 261 262
-                              Store 259(f32v2) 263
-             264:   27(fvec2) Load 260(f32v1)
-             265:   27(fvec2) ExtInst 1(GLSL.std.450) 27(Exp) 264
-                              Store 259(f32v2) 265
-             266:   27(fvec2) Load 260(f32v1)
-             267:   27(fvec2) ExtInst 1(GLSL.std.450) 28(Log) 266
-                              Store 259(f32v2) 267
-             268:   27(fvec2) Load 260(f32v1)
-             269:   27(fvec2) ExtInst 1(GLSL.std.450) 29(Exp2) 268
-                              Store 259(f32v2) 269
-             270:   27(fvec2) Load 260(f32v1)
-             271:   27(fvec2) ExtInst 1(GLSL.std.450) 30(Log2) 270
-                              Store 259(f32v2) 271
-             272:   27(fvec2) Load 260(f32v1)
-             273:   27(fvec2) ExtInst 1(GLSL.std.450) 31(Sqrt) 272
-                              Store 259(f32v2) 273
-             274:   27(fvec2) Load 260(f32v1)
-             275:   27(fvec2) ExtInst 1(GLSL.std.450) 32(InverseSqrt) 274
-                              Store 259(f32v2) 275
+      262(f32v2):     28(ptr) Variable Function
+      263(f32v1):     28(ptr) Variable Function
+             264:   27(fvec2) Load 263(f32v1)
+             265:   27(fvec2) Load 262(f32v2)
+             266:   27(fvec2) ExtInst 1(GLSL.std.450) 26(Pow) 264 265
+                              Store 262(f32v2) 266
+             267:   27(fvec2) Load 263(f32v1)
+             268:   27(fvec2) ExtInst 1(GLSL.std.450) 27(Exp) 267
+                              Store 262(f32v2) 268
+             269:   27(fvec2) Load 263(f32v1)
+             270:   27(fvec2) ExtInst 1(GLSL.std.450) 28(Log) 269
+                              Store 262(f32v2) 270
+             271:   27(fvec2) Load 263(f32v1)
+             272:   27(fvec2) ExtInst 1(GLSL.std.450) 29(Exp2) 271
+                              Store 262(f32v2) 272
+             273:   27(fvec2) Load 263(f32v1)
+             274:   27(fvec2) ExtInst 1(GLSL.std.450) 30(Log2) 273
+                              Store 262(f32v2) 274
+             275:   27(fvec2) Load 263(f32v1)
+             276:   27(fvec2) ExtInst 1(GLSL.std.450) 31(Sqrt) 275
+                              Store 262(f32v2) 276
+             277:   27(fvec2) Load 263(f32v1)
+             278:   27(fvec2) ExtInst 1(GLSL.std.450) 32(InverseSqrt) 277
+                              Store 262(f32v2) 278
                               Return
                               FunctionEnd
 16(builtinCommonFuncs():           2 Function None 3
               17:             Label
-      276(f32v2):    154(ptr) Variable Function
-      277(f32v1):    154(ptr) Variable Function
-        298(f32):     33(ptr) Variable Function
-      302(f32v3):    154(ptr) Variable Function
-         342(bv):    159(ptr) Variable Function
-          363(b):    108(ptr) Variable Function
-         373(iv):    194(ptr) Variable Function
-             278:  153(fvec3) Load 277(f32v1)
-             279:  153(fvec3) ExtInst 1(GLSL.std.450) 4(FAbs) 278
-                              Store 276(f32v2) 279
-             280:  153(fvec3) Load 277(f32v1)
-             281:  153(fvec3) ExtInst 1(GLSL.std.450) 6(FSign) 280
-                              Store 276(f32v2) 281
-             282:  153(fvec3) Load 277(f32v1)
-             283:  153(fvec3) ExtInst 1(GLSL.std.450) 8(Floor) 282
-                              Store 276(f32v2) 283
-             284:  153(fvec3) Load 277(f32v1)
-             285:  153(fvec3) ExtInst 1(GLSL.std.450) 3(Trunc) 284
-                              Store 276(f32v2) 285
-             286:  153(fvec3) Load 277(f32v1)
-             287:  153(fvec3) ExtInst 1(GLSL.std.450) 1(Round) 286
-                              Store 276(f32v2) 287
-             288:  153(fvec3) Load 277(f32v1)
-             289:  153(fvec3) ExtInst 1(GLSL.std.450) 2(RoundEven) 288
-                              Store 276(f32v2) 289
-             290:  153(fvec3) Load 277(f32v1)
-             291:  153(fvec3) ExtInst 1(GLSL.std.450) 9(Ceil) 290
-                              Store 276(f32v2) 291
-             292:  153(fvec3) Load 277(f32v1)
-             293:  153(fvec3) ExtInst 1(GLSL.std.450) 10(Fract) 292
-                              Store 276(f32v2) 293
-             294:  153(fvec3) Load 277(f32v1)
-             295:  153(fvec3) Load 276(f32v2)
-             296:  153(fvec3) FMod 294 295
-                              Store 276(f32v2) 296
-             297:  153(fvec3) Load 277(f32v1)
-             299:   26(float) Load 298(f32)
-             300:  153(fvec3) CompositeConstruct 299 299 299
-             301:  153(fvec3) FMod 297 300
-                              Store 276(f32v2) 301
-             303:  153(fvec3) Load 277(f32v1)
-             304:  153(fvec3) ExtInst 1(GLSL.std.450) 35(Modf) 303 276(f32v2)
-                              Store 302(f32v3) 304
-             305:  153(fvec3) Load 277(f32v1)
-             306:  153(fvec3) Load 276(f32v2)
-             307:  153(fvec3) ExtInst 1(GLSL.std.450) 37(FMin) 305 306
-                              Store 302(f32v3) 307
-             308:  153(fvec3) Load 277(f32v1)
-             309:   26(float) Load 298(f32)
-             310:  153(fvec3) CompositeConstruct 309 309 309
-             311:  153(fvec3) ExtInst 1(GLSL.std.450) 37(FMin) 308 310
-                              Store 302(f32v3) 311
-             312:  153(fvec3) Load 277(f32v1)
-             313:  153(fvec3) Load 276(f32v2)
-             314:  153(fvec3) ExtInst 1(GLSL.std.450) 40(FMax) 312 313
-                              Store 302(f32v3) 314
-             315:  153(fvec3) Load 277(f32v1)
-             316:   26(float) Load 298(f32)
-             317:  153(fvec3) CompositeConstruct 316 316 316
-             318:  153(fvec3) ExtInst 1(GLSL.std.450) 40(FMax) 315 317
-                              Store 302(f32v3) 318
-             319:  153(fvec3) Load 277(f32v1)
-             320:   26(float) Load 298(f32)
-             321:     33(ptr) AccessChain 276(f32v2) 32
-             322:   26(float) Load 321
-             323:  153(fvec3) CompositeConstruct 320 320 320
-             324:  153(fvec3) CompositeConstruct 322 322 322
-             325:  153(fvec3) ExtInst 1(GLSL.std.450) 43(FClamp) 319 323 324
-                              Store 302(f32v3) 325
-             326:  153(fvec3) Load 277(f32v1)
-             327:  153(fvec3) Load 276(f32v2)
-             328:   26(float) Load 298(f32)
-             329:  153(fvec3) CompositeConstruct 328 328 328
-             330:  153(fvec3) ExtInst 1(GLSL.std.450) 43(FClamp) 326 327 329
-                              Store 302(f32v3) 330
-             331:  153(fvec3) Load 277(f32v1)
-             332:  153(fvec3) Load 276(f32v2)
-             333:   26(float) Load 298(f32)
-             334:  153(fvec3) CompositeConstruct 333 333 333
-             335:  153(fvec3) ExtInst 1(GLSL.std.450) 46(FMix) 331 332 334
-                              Store 302(f32v3) 335
-             336:  153(fvec3) Load 277(f32v1)
-             337:  153(fvec3) Load 276(f32v2)
-             338:  153(fvec3) Load 302(f32v3)
-             339:  153(fvec3) ExtInst 1(GLSL.std.450) 46(FMix) 336 337 338
-                              Store 302(f32v3) 339
-             340:  153(fvec3) Load 277(f32v1)
-             341:  153(fvec3) Load 276(f32v2)
-             343:  158(bvec3) Load 342(bv)
-             344:  153(fvec3) Select 343 341 340
-                              Store 302(f32v3) 344
-             345:  153(fvec3) Load 277(f32v1)
-             346:  153(fvec3) Load 276(f32v2)
-             347:  153(fvec3) ExtInst 1(GLSL.std.450) 48(Step) 345 346
-                              Store 302(f32v3) 347
-             348:   26(float) Load 298(f32)
-             349:  153(fvec3) Load 302(f32v3)
-             350:  153(fvec3) CompositeConstruct 348 348 348
-             351:  153(fvec3) ExtInst 1(GLSL.std.450) 48(Step) 350 349
-                              Store 302(f32v3) 351
-             352:  153(fvec3) Load 277(f32v1)
-             353:  153(fvec3) Load 276(f32v2)
-             354:  153(fvec3) Load 302(f32v3)
-             355:  153(fvec3) ExtInst 1(GLSL.std.450) 49(SmoothStep) 352 353 354
-                              Store 302(f32v3) 355
-             356:   26(float) Load 298(f32)
-             357:     33(ptr) AccessChain 277(f32v1) 32
-             358:   26(float) Load 357
-             359:  153(fvec3) Load 276(f32v2)
-             360:  153(fvec3) CompositeConstruct 356 356 356
-             361:  153(fvec3) CompositeConstruct 358 358 358
-             362:  153(fvec3) ExtInst 1(GLSL.std.450) 49(SmoothStep) 360 361 359
-                              Store 302(f32v3) 362
-             364:   26(float) Load 298(f32)
-             365:   107(bool) IsNan 364
-                              Store 363(b) 365
-             366:  153(fvec3) Load 277(f32v1)
-             367:  158(bvec3) IsInf 366
-                              Store 342(bv) 367
-             368:  153(fvec3) Load 277(f32v1)
-             369:  153(fvec3) Load 276(f32v2)
-             370:  153(fvec3) Load 302(f32v3)
-             371:  153(fvec3) ExtInst 1(GLSL.std.450) 50(Fma) 368 369 370
-                              Store 302(f32v3) 371
-             372:  153(fvec3) Load 277(f32v1)
-             375:374(ResType) ExtInst 1(GLSL.std.450) 52(FrexpStruct) 372
-             376:  193(ivec3) CompositeExtract 375 1
-                              Store 373(iv) 376
-             377:  153(fvec3) CompositeExtract 375 0
-                              Store 276(f32v2) 377
-             378:  153(fvec3) Load 277(f32v1)
-             379:  193(ivec3) Load 373(iv)
-             380:  153(fvec3) ExtInst 1(GLSL.std.450) 53(Ldexp) 378 379
-                              Store 276(f32v2) 380
+      279(f32v2):    154(ptr) Variable Function
+      280(f32v1):    154(ptr) Variable Function
+        301(f32):     33(ptr) Variable Function
+      305(f32v3):    154(ptr) Variable Function
+         345(bv):    159(ptr) Variable Function
+          366(b):    108(ptr) Variable Function
+         376(iv):    194(ptr) Variable Function
+             281:  153(fvec3) Load 280(f32v1)
+             282:  153(fvec3) ExtInst 1(GLSL.std.450) 4(FAbs) 281
+                              Store 279(f32v2) 282
+             283:  153(fvec3) Load 280(f32v1)
+             284:  153(fvec3) ExtInst 1(GLSL.std.450) 6(FSign) 283
+                              Store 279(f32v2) 284
+             285:  153(fvec3) Load 280(f32v1)
+             286:  153(fvec3) ExtInst 1(GLSL.std.450) 8(Floor) 285
+                              Store 279(f32v2) 286
+             287:  153(fvec3) Load 280(f32v1)
+             288:  153(fvec3) ExtInst 1(GLSL.std.450) 3(Trunc) 287
+                              Store 279(f32v2) 288
+             289:  153(fvec3) Load 280(f32v1)
+             290:  153(fvec3) ExtInst 1(GLSL.std.450) 1(Round) 289
+                              Store 279(f32v2) 290
+             291:  153(fvec3) Load 280(f32v1)
+             292:  153(fvec3) ExtInst 1(GLSL.std.450) 2(RoundEven) 291
+                              Store 279(f32v2) 292
+             293:  153(fvec3) Load 280(f32v1)
+             294:  153(fvec3) ExtInst 1(GLSL.std.450) 9(Ceil) 293
+                              Store 279(f32v2) 294
+             295:  153(fvec3) Load 280(f32v1)
+             296:  153(fvec3) ExtInst 1(GLSL.std.450) 10(Fract) 295
+                              Store 279(f32v2) 296
+             297:  153(fvec3) Load 280(f32v1)
+             298:  153(fvec3) Load 279(f32v2)
+             299:  153(fvec3) FMod 297 298
+                              Store 279(f32v2) 299
+             300:  153(fvec3) Load 280(f32v1)
+             302:   26(float) Load 301(f32)
+             303:  153(fvec3) CompositeConstruct 302 302 302
+             304:  153(fvec3) FMod 300 303
+                              Store 279(f32v2) 304
+             306:  153(fvec3) Load 280(f32v1)
+             307:  153(fvec3) ExtInst 1(GLSL.std.450) 35(Modf) 306 279(f32v2)
+                              Store 305(f32v3) 307
+             308:  153(fvec3) Load 280(f32v1)
+             309:  153(fvec3) Load 279(f32v2)
+             310:  153(fvec3) ExtInst 1(GLSL.std.450) 37(FMin) 308 309
+                              Store 305(f32v3) 310
+             311:  153(fvec3) Load 280(f32v1)
+             312:   26(float) Load 301(f32)
+             313:  153(fvec3) CompositeConstruct 312 312 312
+             314:  153(fvec3) ExtInst 1(GLSL.std.450) 37(FMin) 311 313
+                              Store 305(f32v3) 314
+             315:  153(fvec3) Load 280(f32v1)
+             316:  153(fvec3) Load 279(f32v2)
+             317:  153(fvec3) ExtInst 1(GLSL.std.450) 40(FMax) 315 316
+                              Store 305(f32v3) 317
+             318:  153(fvec3) Load 280(f32v1)
+             319:   26(float) Load 301(f32)
+             320:  153(fvec3) CompositeConstruct 319 319 319
+             321:  153(fvec3) ExtInst 1(GLSL.std.450) 40(FMax) 318 320
+                              Store 305(f32v3) 321
+             322:  153(fvec3) Load 280(f32v1)
+             323:   26(float) Load 301(f32)
+             324:     33(ptr) AccessChain 279(f32v2) 32
+             325:   26(float) Load 324
+             326:  153(fvec3) CompositeConstruct 323 323 323
+             327:  153(fvec3) CompositeConstruct 325 325 325
+             328:  153(fvec3) ExtInst 1(GLSL.std.450) 43(FClamp) 322 326 327
+                              Store 305(f32v3) 328
+             329:  153(fvec3) Load 280(f32v1)
+             330:  153(fvec3) Load 279(f32v2)
+             331:   26(float) Load 301(f32)
+             332:  153(fvec3) CompositeConstruct 331 331 331
+             333:  153(fvec3) ExtInst 1(GLSL.std.450) 43(FClamp) 329 330 332
+                              Store 305(f32v3) 333
+             334:  153(fvec3) Load 280(f32v1)
+             335:  153(fvec3) Load 279(f32v2)
+             336:   26(float) Load 301(f32)
+             337:  153(fvec3) CompositeConstruct 336 336 336
+             338:  153(fvec3) ExtInst 1(GLSL.std.450) 46(FMix) 334 335 337
+                              Store 305(f32v3) 338
+             339:  153(fvec3) Load 280(f32v1)
+             340:  153(fvec3) Load 279(f32v2)
+             341:  153(fvec3) Load 305(f32v3)
+             342:  153(fvec3) ExtInst 1(GLSL.std.450) 46(FMix) 339 340 341
+                              Store 305(f32v3) 342
+             343:  153(fvec3) Load 280(f32v1)
+             344:  153(fvec3) Load 279(f32v2)
+             346:  158(bvec3) Load 345(bv)
+             347:  153(fvec3) Select 346 344 343
+                              Store 305(f32v3) 347
+             348:  153(fvec3) Load 280(f32v1)
+             349:  153(fvec3) Load 279(f32v2)
+             350:  153(fvec3) ExtInst 1(GLSL.std.450) 48(Step) 348 349
+                              Store 305(f32v3) 350
+             351:   26(float) Load 301(f32)
+             352:  153(fvec3) Load 305(f32v3)
+             353:  153(fvec3) CompositeConstruct 351 351 351
+             354:  153(fvec3) ExtInst 1(GLSL.std.450) 48(Step) 353 352
+                              Store 305(f32v3) 354
+             355:  153(fvec3) Load 280(f32v1)
+             356:  153(fvec3) Load 279(f32v2)
+             357:  153(fvec3) Load 305(f32v3)
+             358:  153(fvec3) ExtInst 1(GLSL.std.450) 49(SmoothStep) 355 356 357
+                              Store 305(f32v3) 358
+             359:   26(float) Load 301(f32)
+             360:     33(ptr) AccessChain 280(f32v1) 32
+             361:   26(float) Load 360
+             362:  153(fvec3) Load 279(f32v2)
+             363:  153(fvec3) CompositeConstruct 359 359 359
+             364:  153(fvec3) CompositeConstruct 361 361 361
+             365:  153(fvec3) ExtInst 1(GLSL.std.450) 49(SmoothStep) 363 364 362
+                              Store 305(f32v3) 365
+             367:   26(float) Load 301(f32)
+             368:   107(bool) IsNan 367
+                              Store 366(b) 368
+             369:  153(fvec3) Load 280(f32v1)
+             370:  158(bvec3) IsInf 369
+                              Store 345(bv) 370
+             371:  153(fvec3) Load 280(f32v1)
+             372:  153(fvec3) Load 279(f32v2)
+             373:  153(fvec3) Load 305(f32v3)
+             374:  153(fvec3) ExtInst 1(GLSL.std.450) 50(Fma) 371 372 373
+                              Store 305(f32v3) 374
+             375:  153(fvec3) Load 280(f32v1)
+             378:377(ResType) ExtInst 1(GLSL.std.450) 52(FrexpStruct) 375
+             379:  193(ivec3) CompositeExtract 378 1
+                              Store 376(iv) 379
+             380:  153(fvec3) CompositeExtract 378 0
+                              Store 279(f32v2) 380
+             381:  153(fvec3) Load 280(f32v1)
+             382:  193(ivec3) Load 376(iv)
+             383:  153(fvec3) ExtInst 1(GLSL.std.450) 53(Ldexp) 381 382
+                              Store 279(f32v2) 383
                               Return
                               FunctionEnd
 18(builtinGeometryFuncs():           2 Function None 3
               19:             Label
-        381(f32):     33(ptr) Variable Function
-      382(f32v1):    154(ptr) Variable Function
-      386(f32v2):    154(ptr) Variable Function
-      392(f32v3):    154(ptr) Variable Function
-             383:  153(fvec3) Load 382(f32v1)
-             384:   26(float) ExtInst 1(GLSL.std.450) 66(Length) 383
-                              Store 381(f32) 384
-             385:  153(fvec3) Load 382(f32v1)
-             387:  153(fvec3) Load 386(f32v2)
-             388:   26(float) ExtInst 1(GLSL.std.450) 67(Distance) 385 387
-                              Store 381(f32) 388
-             389:  153(fvec3) Load 382(f32v1)
-             390:  153(fvec3) Load 386(f32v2)
-             391:   26(float) Dot 389 390
-                              Store 381(f32) 391
-             393:  153(fvec3) Load 382(f32v1)
-             394:  153(fvec3) Load 386(f32v2)
-             395:  153(fvec3) ExtInst 1(GLSL.std.450) 68(Cross) 393 394
-                              Store 392(f32v3) 395
-             396:  153(fvec3) Load 382(f32v1)
-             397:  153(fvec3) ExtInst 1(GLSL.std.450) 69(Normalize) 396
-                              Store 386(f32v2) 397
-             398:  153(fvec3) Load 382(f32v1)
-             399:  153(fvec3) Load 386(f32v2)
-             400:  153(fvec3) Load 392(f32v3)
-             401:  153(fvec3) ExtInst 1(GLSL.std.450) 70(FaceForward) 398 399 400
-                              Store 392(f32v3) 401
-             402:  153(fvec3) Load 382(f32v1)
-             403:  153(fvec3) Load 386(f32v2)
-             404:  153(fvec3) ExtInst 1(GLSL.std.450) 71(Reflect) 402 403
-                              Store 392(f32v3) 404
-             405:  153(fvec3) Load 382(f32v1)
-             406:  153(fvec3) Load 386(f32v2)
-             407:   26(float) Load 381(f32)
-             408:  153(fvec3) ExtInst 1(GLSL.std.450) 72(Refract) 405 406 407
-                              Store 392(f32v3) 408
+        384(f32):     33(ptr) Variable Function
+      385(f32v1):    154(ptr) Variable Function
+      389(f32v2):    154(ptr) Variable Function
+      395(f32v3):    154(ptr) Variable Function
+             386:  153(fvec3) Load 385(f32v1)
+             387:   26(float) ExtInst 1(GLSL.std.450) 66(Length) 386
+                              Store 384(f32) 387
+             388:  153(fvec3) Load 385(f32v1)
+             390:  153(fvec3) Load 389(f32v2)
+             391:   26(float) ExtInst 1(GLSL.std.450) 67(Distance) 388 390
+                              Store 384(f32) 391
+             392:  153(fvec3) Load 385(f32v1)
+             393:  153(fvec3) Load 389(f32v2)
+             394:   26(float) Dot 392 393
+                              Store 384(f32) 394
+             396:  153(fvec3) Load 385(f32v1)
+             397:  153(fvec3) Load 389(f32v2)
+             398:  153(fvec3) ExtInst 1(GLSL.std.450) 68(Cross) 396 397
+                              Store 395(f32v3) 398
+             399:  153(fvec3) Load 385(f32v1)
+             400:  153(fvec3) ExtInst 1(GLSL.std.450) 69(Normalize) 399
+                              Store 389(f32v2) 400
+             401:  153(fvec3) Load 385(f32v1)
+             402:  153(fvec3) Load 389(f32v2)
+             403:  153(fvec3) Load 395(f32v3)
+             404:  153(fvec3) ExtInst 1(GLSL.std.450) 70(FaceForward) 401 402 403
+                              Store 395(f32v3) 404
+             405:  153(fvec3) Load 385(f32v1)
+             406:  153(fvec3) Load 389(f32v2)
+             407:  153(fvec3) ExtInst 1(GLSL.std.450) 71(Reflect) 405 406
+                              Store 395(f32v3) 407
+             408:  153(fvec3) Load 385(f32v1)
+             409:  153(fvec3) Load 389(f32v2)
+             410:   26(float) Load 384(f32)
+             411:  153(fvec3) ExtInst 1(GLSL.std.450) 72(Refract) 408 409 410
+                              Store 395(f32v3) 411
                               Return
                               FunctionEnd
 20(builtinMatrixFuncs():           2 Function None 3
               21:             Label
-      411(f32m3):    410(ptr) Variable Function
-      412(f32m1):    410(ptr) Variable Function
-      414(f32m2):    410(ptr) Variable Function
-      423(f32v1):    154(ptr) Variable Function
-      425(f32v2):     28(ptr) Variable Function
-      430(f32m4):    429(ptr) Variable Function
-        433(f32):     33(ptr) Variable Function
-      436(f32m5):    435(ptr) Variable Function
-      441(f32m6):    440(ptr) Variable Function
-      442(f32m7):    440(ptr) Variable Function
-             413:         409 Load 412(f32m1)
-             415:         409 Load 414(f32m2)
-             416:  153(fvec3) CompositeExtract 413 0
-             417:  153(fvec3) CompositeExtract 415 0
-             418:  153(fvec3) FMul 416 417
-             419:  153(fvec3) CompositeExtract 413 1
-             420:  153(fvec3) CompositeExtract 415 1
+      414(f32m3):    413(ptr) Variable Function
+      415(f32m1):    413(ptr) Variable Function
+      417(f32m2):    413(ptr) Variable Function
+      426(f32v1):    154(ptr) Variable Function
+      428(f32v2):     28(ptr) Variable Function
+      433(f32m4):    432(ptr) Variable Function
+        436(f32):     33(ptr) Variable Function
+      439(f32m5):    438(ptr) Variable Function
+      444(f32m6):    443(ptr) Variable Function
+      445(f32m7):    443(ptr) Variable Function
+             416:         412 Load 415(f32m1)
+             418:         412 Load 417(f32m2)
+             419:  153(fvec3) CompositeExtract 416 0
+             420:  153(fvec3) CompositeExtract 418 0
              421:  153(fvec3) FMul 419 420
-             422:         409 CompositeConstruct 418 421
-                              Store 411(f32m3) 422
-             424:  153(fvec3) Load 423(f32v1)
-             426:   27(fvec2) Load 425(f32v2)
-             427:         409 OuterProduct 424 426
-                              Store 412(f32m1) 427
-             431:         409 Load 412(f32m1)
-             432:         428 Transpose 431
-                              Store 430(f32m4) 432
-             437:         434 Load 436(f32m5)
-             438:   26(float) ExtInst 1(GLSL.std.450) 33(Determinant) 437
-                              Store 433(f32) 438
-             443:         439 Load 442(f32m7)
-             444:         439 ExtInst 1(GLSL.std.450) 34(MatrixInverse) 443
-                              Store 441(f32m6) 444
+             422:  153(fvec3) CompositeExtract 416 1
+             423:  153(fvec3) CompositeExtract 418 1
+             424:  153(fvec3) FMul 422 423
+             425:         412 CompositeConstruct 421 424
+                              Store 414(f32m3) 425
+             427:  153(fvec3) Load 426(f32v1)
+             429:   27(fvec2) Load 428(f32v2)
+             430:         412 OuterProduct 427 429
+                              Store 415(f32m1) 430
+             434:         412 Load 415(f32m1)
+             435:         431 Transpose 434
+                              Store 433(f32m4) 435
+             440:         437 Load 439(f32m5)
+             441:   26(float) ExtInst 1(GLSL.std.450) 33(Determinant) 440
+                              Store 436(f32) 441
+             446:         442 Load 445(f32m7)
+             447:         442 ExtInst 1(GLSL.std.450) 34(MatrixInverse) 446
+                              Store 444(f32m6) 447
                               Return
                               FunctionEnd
 22(builtinVecRelFuncs():           2 Function None 3
               23:             Label
-         445(bv):    159(ptr) Variable Function
-      446(f32v1):    154(ptr) Variable Function
-      448(f32v2):    154(ptr) Variable Function
-             447:  153(fvec3) Load 446(f32v1)
-             449:  153(fvec3) Load 448(f32v2)
-             450:  158(bvec3) FOrdLessThan 447 449
-                              Store 445(bv) 450
-             451:  153(fvec3) Load 446(f32v1)
-             452:  153(fvec3) Load 448(f32v2)
-             453:  158(bvec3) FOrdLessThanEqual 451 452
-                              Store 445(bv) 453
-             454:  153(fvec3) Load 446(f32v1)
-             455:  153(fvec3) Load 448(f32v2)
-             456:  158(bvec3) FOrdGreaterThan 454 455
-                              Store 445(bv) 456
-             457:  153(fvec3) Load 446(f32v1)
-             458:  153(fvec3) Load 448(f32v2)
-             459:  158(bvec3) FOrdGreaterThanEqual 457 458
-                              Store 445(bv) 459
-             460:  153(fvec3) Load 446(f32v1)
-             461:  153(fvec3) Load 448(f32v2)
-             462:  158(bvec3) FOrdEqual 460 461
-                              Store 445(bv) 462
-             463:  153(fvec3) Load 446(f32v1)
-             464:  153(fvec3) Load 448(f32v2)
-             465:  158(bvec3) FOrdNotEqual 463 464
-                              Store 445(bv) 465
+         448(bv):    159(ptr) Variable Function
+      449(f32v1):    154(ptr) Variable Function
+      451(f32v2):    154(ptr) Variable Function
+             450:  153(fvec3) Load 449(f32v1)
+             452:  153(fvec3) Load 451(f32v2)
+             453:  158(bvec3) FOrdLessThan 450 452
+                              Store 448(bv) 453
+             454:  153(fvec3) Load 449(f32v1)
+             455:  153(fvec3) Load 451(f32v2)
+             456:  158(bvec3) FOrdLessThanEqual 454 455
+                              Store 448(bv) 456
+             457:  153(fvec3) Load 449(f32v1)
+             458:  153(fvec3) Load 451(f32v2)
+             459:  158(bvec3) FOrdGreaterThan 457 458
+                              Store 448(bv) 459
+             460:  153(fvec3) Load 449(f32v1)
+             461:  153(fvec3) Load 451(f32v2)
+             462:  158(bvec3) FOrdGreaterThanEqual 460 461
+                              Store 448(bv) 462
+             463:  153(fvec3) Load 449(f32v1)
+             464:  153(fvec3) Load 451(f32v2)
+             465:  158(bvec3) FOrdEqual 463 464
+                              Store 448(bv) 465
+             466:  153(fvec3) Load 449(f32v1)
+             467:  153(fvec3) Load 451(f32v2)
+             468:  158(bvec3) FOrdNotEqual 466 467
+                              Store 448(bv) 468
                               Return
                               FunctionEnd
 24(builtinFragProcFuncs():           2 Function None 3
               25:             Label
-       466(f32v):    154(ptr) Variable Function
-             470:    469(ptr) AccessChain 468(if32v) 32
-             471:   26(float) Load 470
-             472:   26(float) DPdx 471
-             473:     33(ptr) AccessChain 466(f32v) 32
-                              Store 473 472
-             474:    469(ptr) AccessChain 468(if32v) 88
-             475:   26(float) Load 474
-             476:   26(float) DPdy 475
-             477:     33(ptr) AccessChain 466(f32v) 88
-                              Store 477 476
-             478:  153(fvec3) Load 468(if32v)
-             479:   27(fvec2) VectorShuffle 478 478 0 1
-             480:   27(fvec2) DPdxFine 479
-             481:  153(fvec3) Load 466(f32v)
-             482:  153(fvec3) VectorShuffle 481 480 3 4 2
-                              Store 466(f32v) 482
-             483:  153(fvec3) Load 468(if32v)
-             484:   27(fvec2) VectorShuffle 483 483 0 1
-             485:   27(fvec2) DPdyFine 484
-             486:  153(fvec3) Load 466(f32v)
-             487:  153(fvec3) VectorShuffle 486 485 3 4 2
-                              Store 466(f32v) 487
-             488:  153(fvec3) Load 468(if32v)
-             489:  153(fvec3) DPdxCoarse 488
-                              Store 466(f32v) 489
-             490:  153(fvec3) Load 468(if32v)
-             491:  153(fvec3) DPdxCoarse 490
-                              Store 466(f32v) 491
-             492:    469(ptr) AccessChain 468(if32v) 32
-             493:   26(float) Load 492
-             494:   26(float) Fwidth 493
-             495:     33(ptr) AccessChain 466(f32v) 32
-                              Store 495 494
-             496:  153(fvec3) Load 468(if32v)
-             497:   27(fvec2) VectorShuffle 496 496 0 1
-             498:   27(fvec2) FwidthFine 497
-             499:  153(fvec3) Load 466(f32v)
-             500:  153(fvec3) VectorShuffle 499 498 3 4 2
-                              Store 466(f32v) 500
-             501:  153(fvec3) Load 468(if32v)
-             502:  153(fvec3) FwidthCoarse 501
-                              Store 466(f32v) 502
-             503:    469(ptr) AccessChain 468(if32v) 32
-             504:   26(float) ExtInst 1(GLSL.std.450) 76(InterpolateAtCentroid) 503
-             505:     33(ptr) AccessChain 466(f32v) 32
-                              Store 505 504
-             507:  153(fvec3) ExtInst 1(GLSL.std.450) 77(InterpolateAtSample) 468(if32v) 506
-             508:   27(fvec2) VectorShuffle 507 507 0 1
-             509:  153(fvec3) Load 466(f32v)
-             510:  153(fvec3) VectorShuffle 509 508 3 4 2
-                              Store 466(f32v) 510
-             513:  153(fvec3) ExtInst 1(GLSL.std.450) 78(InterpolateAtOffset) 468(if32v) 512
-                              Store 466(f32v) 513
+       469(f32v):    154(ptr) Variable Function
+             473:    472(ptr) AccessChain 471(if32v) 32
+             474:   26(float) Load 473
+             475:   26(float) DPdx 474
+             476:     33(ptr) AccessChain 469(f32v) 32
+                              Store 476 475
+             477:    472(ptr) AccessChain 471(if32v) 88
+             478:   26(float) Load 477
+             479:   26(float) DPdy 478
+             480:     33(ptr) AccessChain 469(f32v) 88
+                              Store 480 479
+             481:  153(fvec3) Load 471(if32v)
+             482:   27(fvec2) VectorShuffle 481 481 0 1
+             483:   27(fvec2) DPdxFine 482
+             484:  153(fvec3) Load 469(f32v)
+             485:  153(fvec3) VectorShuffle 484 483 3 4 2
+                              Store 469(f32v) 485
+             486:  153(fvec3) Load 471(if32v)
+             487:   27(fvec2) VectorShuffle 486 486 0 1
+             488:   27(fvec2) DPdyFine 487
+             489:  153(fvec3) Load 469(f32v)
+             490:  153(fvec3) VectorShuffle 489 488 3 4 2
+                              Store 469(f32v) 490
+             491:  153(fvec3) Load 471(if32v)
+             492:  153(fvec3) DPdxCoarse 491
+                              Store 469(f32v) 492
+             493:  153(fvec3) Load 471(if32v)
+             494:  153(fvec3) DPdxCoarse 493
+                              Store 469(f32v) 494
+             495:    472(ptr) AccessChain 471(if32v) 32
+             496:   26(float) Load 495
+             497:   26(float) Fwidth 496
+             498:     33(ptr) AccessChain 469(f32v) 32
+                              Store 498 497
+             499:  153(fvec3) Load 471(if32v)
+             500:   27(fvec2) VectorShuffle 499 499 0 1
+             501:   27(fvec2) FwidthFine 500
+             502:  153(fvec3) Load 469(f32v)
+             503:  153(fvec3) VectorShuffle 502 501 3 4 2
+                              Store 469(f32v) 503
+             504:  153(fvec3) Load 471(if32v)
+             505:  153(fvec3) FwidthCoarse 504
+                              Store 469(f32v) 505
+             506:    472(ptr) AccessChain 471(if32v) 32
+             507:   26(float) ExtInst 1(GLSL.std.450) 76(InterpolateAtCentroid) 506
+             508:     33(ptr) AccessChain 469(f32v) 32
+                              Store 508 507
+             510:  153(fvec3) ExtInst 1(GLSL.std.450) 77(InterpolateAtSample) 471(if32v) 509
+             511:   27(fvec2) VectorShuffle 510 510 0 1
+             512:  153(fvec3) Load 469(f32v)
+             513:  153(fvec3) VectorShuffle 512 511 3 4 2
+                              Store 469(f32v) 513
+             516:  153(fvec3) ExtInst 1(GLSL.std.450) 78(InterpolateAtOffset) 471(if32v) 515
+                              Store 469(f32v) 516
                               Return
                               FunctionEnd

3rdparty/glslang/Test/baseResults/spv.float64.frag.out

@@ -1,7 +1,7 @@
 spv.float64.frag
 // Module Version 10300
 // Generated by (magic number): 80007
-// Id's are bound by 521
+// Id's are bound by 524
 
                               Capability Shader
                               Capability Float16
@@ -13,7 +13,7 @@ spv.float64.frag
                               Capability InterpolationFunction
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 458
+                              EntryPoint Fragment 4  "main" 461
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
                               SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
@@ -47,82 +47,82 @@ spv.float64.frag
                               Name 179  "i16v"
                               Name 185  "i32v"
                               Name 191  "i64v"
-                              Name 194  "u8v"
-                              Name 200  "u16v"
-                              Name 205  "u32v"
-                              Name 211  "u64v"
-                              Name 216  "f64v2"
-                              Name 217  "f64v1"
-                              Name 249  "f64v2"
-                              Name 250  "f64v1"
-                              Name 266  "f64v2"
-                              Name 267  "f64v1"
-                              Name 288  "f64"
-                              Name 292  "f64v3"
-                              Name 332  "bv"
-                              Name 353  "b"
-                              Name 363  "iv"
-                              Name 364  "ResType"
-                              Name 371  "f64"
-                              Name 372  "f64v1"
-                              Name 376  "f64v2"
-                              Name 382  "f64v3"
-                              Name 401  "f64m3"
-                              Name 402  "f64m1"
-                              Name 404  "f64m2"
-                              Name 413  "f64v1"
-                              Name 415  "f64v2"
-                              Name 420  "f64m4"
-                              Name 423  "f64"
-                              Name 426  "f64m5"
-                              Name 431  "f64m6"
-                              Name 432  "f64m7"
-                              Name 435  "bv"
-                              Name 436  "f64v1"
-                              Name 438  "f64v2"
-                              Name 456  "f64v"
-                              Name 458  "if64v"
-                              Name 507  "S"
-                              MemberName 507(S) 0  "x"
-                              MemberName 507(S) 1  "y"
-                              MemberName 507(S) 2  "z"
-                              Name 509  "B1"
-                              MemberName 509(B1) 0  "a"
-                              MemberName 509(B1) 1  "b"
-                              MemberName 509(B1) 2  "c"
-                              MemberName 509(B1) 3  "d"
-                              MemberName 509(B1) 4  "e"
-                              MemberName 509(B1) 5  "f"
-                              MemberName 509(B1) 6  "g"
-                              MemberName 509(B1) 7  "h"
-                              Name 511  ""
-                              Name 512  "sf16"
-                              Name 514  "sf"
-                              Name 515  "sd"
-                              Decorate 458(if64v) Flat
-                              Decorate 505 ArrayStride 16
-                              Decorate 506 ArrayStride 64
-                              MemberDecorate 507(S) 0 Offset 0
-                              MemberDecorate 507(S) 1 Offset 16
-                              MemberDecorate 507(S) 2 Offset 32
-                              Decorate 508 ArrayStride 64
-                              MemberDecorate 509(B1) 0 Offset 0
-                              MemberDecorate 509(B1) 1 Offset 16
-                              MemberDecorate 509(B1) 2 Offset 32
-                              MemberDecorate 509(B1) 3 Offset 64
-                              MemberDecorate 509(B1) 4 ColMajor
-                              MemberDecorate 509(B1) 4 Offset 96
-                              MemberDecorate 509(B1) 4 MatrixStride 32
-                              MemberDecorate 509(B1) 5 ColMajor
-                              MemberDecorate 509(B1) 5 Offset 160
-                              MemberDecorate 509(B1) 5 MatrixStride 32
-                              MemberDecorate 509(B1) 6 Offset 288
-                              MemberDecorate 509(B1) 7 Offset 352
-                              Decorate 509(B1) Block
-                              Decorate 511 DescriptorSet 0
-                              Decorate 512(sf16) SpecId 100
-                              Decorate 514(sf) SpecId 101
-                              Decorate 515(sd) SpecId 102
+                              Name 197  "u8v"
+                              Name 203  "u16v"
+                              Name 208  "u32v"
+                              Name 214  "u64v"
+                              Name 219  "f64v2"
+                              Name 220  "f64v1"
+                              Name 252  "f64v2"
+                              Name 253  "f64v1"
+                              Name 269  "f64v2"
+                              Name 270  "f64v1"
+                              Name 291  "f64"
+                              Name 295  "f64v3"
+                              Name 335  "bv"
+                              Name 356  "b"
+                              Name 366  "iv"
+                              Name 367  "ResType"
+                              Name 374  "f64"
+                              Name 375  "f64v1"
+                              Name 379  "f64v2"
+                              Name 385  "f64v3"
+                              Name 404  "f64m3"
+                              Name 405  "f64m1"
+                              Name 407  "f64m2"
+                              Name 416  "f64v1"
+                              Name 418  "f64v2"
+                              Name 423  "f64m4"
+                              Name 426  "f64"
+                              Name 429  "f64m5"
+                              Name 434  "f64m6"
+                              Name 435  "f64m7"
+                              Name 438  "bv"
+                              Name 439  "f64v1"
+                              Name 441  "f64v2"
+                              Name 459  "f64v"
+                              Name 461  "if64v"
+                              Name 510  "S"
+                              MemberName 510(S) 0  "x"
+                              MemberName 510(S) 1  "y"
+                              MemberName 510(S) 2  "z"
+                              Name 512  "B1"
+                              MemberName 512(B1) 0  "a"
+                              MemberName 512(B1) 1  "b"
+                              MemberName 512(B1) 2  "c"
+                              MemberName 512(B1) 3  "d"
+                              MemberName 512(B1) 4  "e"
+                              MemberName 512(B1) 5  "f"
+                              MemberName 512(B1) 6  "g"
+                              MemberName 512(B1) 7  "h"
+                              Name 514  ""
+                              Name 515  "sf16"
+                              Name 517  "sf"
+                              Name 518  "sd"
+                              Decorate 461(if64v) Flat
+                              Decorate 508 ArrayStride 16
+                              Decorate 509 ArrayStride 64
+                              MemberDecorate 510(S) 0 Offset 0
+                              MemberDecorate 510(S) 1 Offset 16
+                              MemberDecorate 510(S) 2 Offset 32
+                              Decorate 511 ArrayStride 64
+                              MemberDecorate 512(B1) 0 Offset 0
+                              MemberDecorate 512(B1) 1 Offset 16
+                              MemberDecorate 512(B1) 2 Offset 32
+                              MemberDecorate 512(B1) 3 Offset 64
+                              MemberDecorate 512(B1) 4 ColMajor
+                              MemberDecorate 512(B1) 4 Offset 96
+                              MemberDecorate 512(B1) 4 MatrixStride 32
+                              MemberDecorate 512(B1) 5 ColMajor
+                              MemberDecorate 512(B1) 5 Offset 160
+                              MemberDecorate 512(B1) 5 MatrixStride 32
+                              MemberDecorate 512(B1) 6 Offset 288
+                              MemberDecorate 512(B1) 7 Offset 352
+                              Decorate 512(B1) Block
+                              Decorate 514 DescriptorSet 0
+                              Decorate 515(sf16) SpecId 100
+                              Decorate 517(sf) SpecId 101
+                              Decorate 518(sd) SpecId 102
                2:             TypeVoid
                3:             TypeFunction 2
               26:             TypeFloat 64
@@ -163,48 +163,51 @@ spv.float64.frag
              188:             TypeInt 64 1
              189:             TypeVector 188(int64_t) 3
              190:             TypePointer Function 189(i64vec3)
-             197:             TypeInt 16 0
-             198:             TypeVector 197(int16_t) 3
-             199:             TypePointer Function 198(i16vec3)
-             203:             TypeVector 31(int) 3
-             204:             TypePointer Function 203(ivec3)
-             208:             TypeInt 64 0
-             209:             TypeVector 208(int64_t) 3
-             210:             TypePointer Function 209(i64vec3)
-             214:             TypeVector 26(float64_t) 4
-             215:             TypePointer Function 214(f64vec4)
-    364(ResType):             TypeStruct 149(f64vec3) 183(ivec3)
-             399:             TypeMatrix 149(f64vec3) 2
-             400:             TypePointer Function 399
-             418:             TypeMatrix 27(f64vec2) 3
-             419:             TypePointer Function 418
-             424:             TypeMatrix 149(f64vec3) 3
-             425:             TypePointer Function 424
-             429:             TypeMatrix 214(f64vec4) 4
-             430:             TypePointer Function 429
-             457:             TypePointer Input 149(f64vec3)
-      458(if64v):    457(ptr) Variable Input
-             459:             TypePointer Input 26(float64_t)
-             496:    182(int) Constant 1
-             501:26(float64_t) Constant 0 1071644672
-             502: 27(f64vec2) ConstantComposite 501 501
-             504:     31(int) Constant 2
-             505:             TypeArray 26(float64_t) 504
-             506:             TypeArray 399 504
-          507(S):             TypeStruct 26(float64_t) 27(f64vec2) 149(f64vec3)
-             508:             TypeArray 507(S) 504
-         509(B1):             TypeStruct 26(float64_t) 27(f64vec2) 149(f64vec3) 505 399 506 507(S) 508
-             510:             TypePointer Uniform 509(B1)
-             511:    510(ptr) Variable Uniform
-       512(sf16):162(float16_t) SpecConstant 12288
-             513:             TypeFloat 32
-         514(sf):  513(float) SpecConstant 1048576000
-         515(sd):26(float64_t) SpecConstant 0 1071644672
-             516:  513(float) SpecConstantOp 115 512(sf16)
-             517:  513(float) SpecConstantOp 115 512(sf16)
-             518:26(float64_t) SpecConstantOp 115 517
-             519:162(float16_t) SpecConstantOp 115 514(sf)
-             520:162(float16_t) SpecConstantOp 115 515(sd)
+             194:             TypeInt 8 0
+             195:             TypeVector 194(int8_t) 3
+             196:             TypePointer Function 195(i8vec3)
+             200:             TypeInt 16 0
+             201:             TypeVector 200(int16_t) 3
+             202:             TypePointer Function 201(i16vec3)
+             206:             TypeVector 31(int) 3
+             207:             TypePointer Function 206(ivec3)
+             211:             TypeInt 64 0
+             212:             TypeVector 211(int64_t) 3
+             213:             TypePointer Function 212(i64vec3)
+             217:             TypeVector 26(float64_t) 4
+             218:             TypePointer Function 217(f64vec4)
+    367(ResType):             TypeStruct 149(f64vec3) 183(ivec3)
+             402:             TypeMatrix 149(f64vec3) 2
+             403:             TypePointer Function 402
+             421:             TypeMatrix 27(f64vec2) 3
+             422:             TypePointer Function 421
+             427:             TypeMatrix 149(f64vec3) 3
+             428:             TypePointer Function 427
+             432:             TypeMatrix 217(f64vec4) 4
+             433:             TypePointer Function 432
+             460:             TypePointer Input 149(f64vec3)
+      461(if64v):    460(ptr) Variable Input
+             462:             TypePointer Input 26(float64_t)
+             499:    182(int) Constant 1
+             504:26(float64_t) Constant 0 1071644672
+             505: 27(f64vec2) ConstantComposite 504 504
+             507:     31(int) Constant 2
+             508:             TypeArray 26(float64_t) 507
+             509:             TypeArray 402 507
+          510(S):             TypeStruct 26(float64_t) 27(f64vec2) 149(f64vec3)
+             511:             TypeArray 510(S) 507
+         512(B1):             TypeStruct 26(float64_t) 27(f64vec2) 149(f64vec3) 508 402 509 510(S) 511
+             513:             TypePointer Uniform 512(B1)
+             514:    513(ptr) Variable Uniform
+       515(sf16):162(float16_t) SpecConstant 12288
+             516:             TypeFloat 32
+         517(sf):  516(float) SpecConstant 1048576000
+         518(sd):26(float64_t) SpecConstant 0 1071644672
+             519:  516(float) SpecConstantOp 115 515(sf16)
+             520:  516(float) SpecConstantOp 115 515(sf16)
+             521:26(float64_t) SpecConstantOp 115 520
+             522:162(float16_t) SpecConstantOp 115 517(sf)
+             523:162(float16_t) SpecConstantOp 115 518(sd)
          4(main):           2 Function None 3
                5:             Label
                               Return
@@ -360,10 +363,10 @@ spv.float64.frag
        179(i16v):    178(ptr) Variable Function
        185(i32v):    184(ptr) Variable Function
        191(i64v):    190(ptr) Variable Function
-        194(u8v):    172(ptr) Variable Function
-       200(u16v):    199(ptr) Variable Function
-       205(u32v):    204(ptr) Variable Function
-       211(u64v):    210(ptr) Variable Function
+        197(u8v):    196(ptr) Variable Function
+       203(u16v):    202(ptr) Variable Function
+       208(u32v):    207(ptr) Variable Function
+       214(u64v):    213(ptr) Variable Function
              155:  152(bvec3) Load 154(bv)
              159:149(f64vec3) Select 155 158 157
                               Store 151(f64v) 159
@@ -388,401 +391,401 @@ spv.float64.frag
              192:149(f64vec3) Load 151(f64v)
              193:189(i64vec3) ConvertFToS 192
                               Store 191(i64v) 193
-             195:149(f64vec3) Load 151(f64v)
-             196: 171(i8vec3) ConvertFToS 195
-                              Store 194(u8v) 196
-             201:149(f64vec3) Load 151(f64v)
-             202:198(i16vec3) ConvertFToU 201
-                              Store 200(u16v) 202
-             206:149(f64vec3) Load 151(f64v)
-             207:  203(ivec3) ConvertFToU 206
-                              Store 205(u32v) 207
-             212:149(f64vec3) Load 151(f64v)
-             213:209(i64vec3) ConvertFToU 212
-                              Store 211(u64v) 213
+             198:149(f64vec3) Load 151(f64v)
+             199: 195(i8vec3) ConvertFToU 198
+                              Store 197(u8v) 199
+             204:149(f64vec3) Load 151(f64v)
+             205:201(i16vec3) ConvertFToU 204
+                              Store 203(u16v) 205
+             209:149(f64vec3) Load 151(f64v)
+             210:  206(ivec3) ConvertFToU 209
+                              Store 208(u32v) 210
+             215:149(f64vec3) Load 151(f64v)
+             216:212(i64vec3) ConvertFToU 215
+                              Store 214(u64v) 216
                               Return
                               FunctionEnd
 12(builtinAngleTrigFuncs():           2 Function None 3
               13:             Label
-      216(f64v2):    215(ptr) Variable Function
-      217(f64v1):    215(ptr) Variable Function
-             218:214(f64vec4) Load 217(f64v1)
-             219:214(f64vec4) ExtInst 1(GLSL.std.450) 11(Radians) 218
-                              Store 216(f64v2) 219
-             220:214(f64vec4) Load 217(f64v1)
-             221:214(f64vec4) ExtInst 1(GLSL.std.450) 12(Degrees) 220
-                              Store 216(f64v2) 221
-             222:214(f64vec4) Load 217(f64v1)
-             223:214(f64vec4) ExtInst 1(GLSL.std.450) 13(Sin) 222
-                              Store 216(f64v2) 223
-             224:214(f64vec4) Load 217(f64v1)
-             225:214(f64vec4) ExtInst 1(GLSL.std.450) 14(Cos) 224
-                              Store 216(f64v2) 225
-             226:214(f64vec4) Load 217(f64v1)
-             227:214(f64vec4) ExtInst 1(GLSL.std.450) 15(Tan) 226
-                              Store 216(f64v2) 227
-             228:214(f64vec4) Load 217(f64v1)
-             229:214(f64vec4) ExtInst 1(GLSL.std.450) 16(Asin) 228
-                              Store 216(f64v2) 229
-             230:214(f64vec4) Load 217(f64v1)
-             231:214(f64vec4) ExtInst 1(GLSL.std.450) 17(Acos) 230
-                              Store 216(f64v2) 231
-             232:214(f64vec4) Load 217(f64v1)
-             233:214(f64vec4) Load 216(f64v2)
-             234:214(f64vec4) ExtInst 1(GLSL.std.450) 25(Atan2) 232 233
-                              Store 216(f64v2) 234
-             235:214(f64vec4) Load 217(f64v1)
-             236:214(f64vec4) ExtInst 1(GLSL.std.450) 18(Atan) 235
-                              Store 216(f64v2) 236
-             237:214(f64vec4) Load 217(f64v1)
-             238:214(f64vec4) ExtInst 1(GLSL.std.450) 19(Sinh) 237
-                              Store 216(f64v2) 238
-             239:214(f64vec4) Load 217(f64v1)
-             240:214(f64vec4) ExtInst 1(GLSL.std.450) 20(Cosh) 239
-                              Store 216(f64v2) 240
-             241:214(f64vec4) Load 217(f64v1)
-             242:214(f64vec4) ExtInst 1(GLSL.std.450) 21(Tanh) 241
-                              Store 216(f64v2) 242
-             243:214(f64vec4) Load 217(f64v1)
-             244:214(f64vec4) ExtInst 1(GLSL.std.450) 22(Asinh) 243
-                              Store 216(f64v2) 244
-             245:214(f64vec4) Load 217(f64v1)
-             246:214(f64vec4) ExtInst 1(GLSL.std.450) 23(Acosh) 245
-                              Store 216(f64v2) 246
-             247:214(f64vec4) Load 217(f64v1)
-             248:214(f64vec4) ExtInst 1(GLSL.std.450) 24(Atanh) 247
-                              Store 216(f64v2) 248
+      219(f64v2):    218(ptr) Variable Function
+      220(f64v1):    218(ptr) Variable Function
+             221:217(f64vec4) Load 220(f64v1)
+             222:217(f64vec4) ExtInst 1(GLSL.std.450) 11(Radians) 221
+                              Store 219(f64v2) 222
+             223:217(f64vec4) Load 220(f64v1)
+             224:217(f64vec4) ExtInst 1(GLSL.std.450) 12(Degrees) 223
+                              Store 219(f64v2) 224
+             225:217(f64vec4) Load 220(f64v1)
+             226:217(f64vec4) ExtInst 1(GLSL.std.450) 13(Sin) 225
+                              Store 219(f64v2) 226
+             227:217(f64vec4) Load 220(f64v1)
+             228:217(f64vec4) ExtInst 1(GLSL.std.450) 14(Cos) 227
+                              Store 219(f64v2) 228
+             229:217(f64vec4) Load 220(f64v1)
+             230:217(f64vec4) ExtInst 1(GLSL.std.450) 15(Tan) 229
+                              Store 219(f64v2) 230
+             231:217(f64vec4) Load 220(f64v1)
+             232:217(f64vec4) ExtInst 1(GLSL.std.450) 16(Asin) 231
+                              Store 219(f64v2) 232
+             233:217(f64vec4) Load 220(f64v1)
+             234:217(f64vec4) ExtInst 1(GLSL.std.450) 17(Acos) 233
+                              Store 219(f64v2) 234
+             235:217(f64vec4) Load 220(f64v1)
+             236:217(f64vec4) Load 219(f64v2)
+             237:217(f64vec4) ExtInst 1(GLSL.std.450) 25(Atan2) 235 236
+                              Store 219(f64v2) 237
+             238:217(f64vec4) Load 220(f64v1)
+             239:217(f64vec4) ExtInst 1(GLSL.std.450) 18(Atan) 238
+                              Store 219(f64v2) 239
+             240:217(f64vec4) Load 220(f64v1)
+             241:217(f64vec4) ExtInst 1(GLSL.std.450) 19(Sinh) 240
+                              Store 219(f64v2) 241
+             242:217(f64vec4) Load 220(f64v1)
+             243:217(f64vec4) ExtInst 1(GLSL.std.450) 20(Cosh) 242
+                              Store 219(f64v2) 243
+             244:217(f64vec4) Load 220(f64v1)
+             245:217(f64vec4) ExtInst 1(GLSL.std.450) 21(Tanh) 244
+                              Store 219(f64v2) 245
+             246:217(f64vec4) Load 220(f64v1)
+             247:217(f64vec4) ExtInst 1(GLSL.std.450) 22(Asinh) 246
+                              Store 219(f64v2) 247
+             248:217(f64vec4) Load 220(f64v1)
+             249:217(f64vec4) ExtInst 1(GLSL.std.450) 23(Acosh) 248
+                              Store 219(f64v2) 249
+             250:217(f64vec4) Load 220(f64v1)
+             251:217(f64vec4) ExtInst 1(GLSL.std.450) 24(Atanh) 250
+                              Store 219(f64v2) 251
                               Return
                               FunctionEnd
 14(builtinExpFuncs():           2 Function None 3
               15:             Label
-      249(f64v2):     28(ptr) Variable Function
-      250(f64v1):     28(ptr) Variable Function
-             251: 27(f64vec2) Load 250(f64v1)
-             252: 27(f64vec2) Load 249(f64v2)
-             253: 27(f64vec2) ExtInst 1(GLSL.std.450) 26(Pow) 251 252
-                              Store 249(f64v2) 253
-             254: 27(f64vec2) Load 250(f64v1)
-             255: 27(f64vec2) ExtInst 1(GLSL.std.450) 27(Exp) 254
-                              Store 249(f64v2) 255
-             256: 27(f64vec2) Load 250(f64v1)
-             257: 27(f64vec2) ExtInst 1(GLSL.std.450) 28(Log) 256
-                              Store 249(f64v2) 257
-             258: 27(f64vec2) Load 250(f64v1)
-             259: 27(f64vec2) ExtInst 1(GLSL.std.450) 29(Exp2) 258
-                              Store 249(f64v2) 259
-             260: 27(f64vec2) Load 250(f64v1)
-             261: 27(f64vec2) ExtInst 1(GLSL.std.450) 30(Log2) 260
-                              Store 249(f64v2) 261
-             262: 27(f64vec2) Load 250(f64v1)
-             263: 27(f64vec2) ExtInst 1(GLSL.std.450) 31(Sqrt) 262
-                              Store 249(f64v2) 263
-             264: 27(f64vec2) Load 250(f64v1)
-             265: 27(f64vec2) ExtInst 1(GLSL.std.450) 32(InverseSqrt) 264
-                              Store 249(f64v2) 265
+      252(f64v2):     28(ptr) Variable Function
+      253(f64v1):     28(ptr) Variable Function
+             254: 27(f64vec2) Load 253(f64v1)
+             255: 27(f64vec2) Load 252(f64v2)
+             256: 27(f64vec2) ExtInst 1(GLSL.std.450) 26(Pow) 254 255
+                              Store 252(f64v2) 256
+             257: 27(f64vec2) Load 253(f64v1)
+             258: 27(f64vec2) ExtInst 1(GLSL.std.450) 27(Exp) 257
+                              Store 252(f64v2) 258
+             259: 27(f64vec2) Load 253(f64v1)
+             260: 27(f64vec2) ExtInst 1(GLSL.std.450) 28(Log) 259
+                              Store 252(f64v2) 260
+             261: 27(f64vec2) Load 253(f64v1)
+             262: 27(f64vec2) ExtInst 1(GLSL.std.450) 29(Exp2) 261
+                              Store 252(f64v2) 262
+             263: 27(f64vec2) Load 253(f64v1)
+             264: 27(f64vec2) ExtInst 1(GLSL.std.450) 30(Log2) 263
+                              Store 252(f64v2) 264
+             265: 27(f64vec2) Load 253(f64v1)
+             266: 27(f64vec2) ExtInst 1(GLSL.std.450) 31(Sqrt) 265
+                              Store 252(f64v2) 266
+             267: 27(f64vec2) Load 253(f64v1)
+             268: 27(f64vec2) ExtInst 1(GLSL.std.450) 32(InverseSqrt) 267
+                              Store 252(f64v2) 268
                               Return
                               FunctionEnd
 16(builtinCommonFuncs():           2 Function None 3
               17:             Label
-      266(f64v2):    150(ptr) Variable Function
-      267(f64v1):    150(ptr) Variable Function
-        288(f64):     33(ptr) Variable Function
-      292(f64v3):    150(ptr) Variable Function
-         332(bv):    153(ptr) Variable Function
-          353(b):    108(ptr) Variable Function
-         363(iv):    184(ptr) Variable Function
-             268:149(f64vec3) Load 267(f64v1)
-             269:149(f64vec3) ExtInst 1(GLSL.std.450) 4(FAbs) 268
-                              Store 266(f64v2) 269
-             270:149(f64vec3) Load 267(f64v1)
-             271:149(f64vec3) ExtInst 1(GLSL.std.450) 6(FSign) 270
-                              Store 266(f64v2) 271
-             272:149(f64vec3) Load 267(f64v1)
-             273:149(f64vec3) ExtInst 1(GLSL.std.450) 8(Floor) 272
-                              Store 266(f64v2) 273
-             274:149(f64vec3) Load 267(f64v1)
-             275:149(f64vec3) ExtInst 1(GLSL.std.450) 3(Trunc) 274
-                              Store 266(f64v2) 275
-             276:149(f64vec3) Load 267(f64v1)
-             277:149(f64vec3) ExtInst 1(GLSL.std.450) 1(Round) 276
-                              Store 266(f64v2) 277
-             278:149(f64vec3) Load 267(f64v1)
-             279:149(f64vec3) ExtInst 1(GLSL.std.450) 2(RoundEven) 278
-                              Store 266(f64v2) 279
-             280:149(f64vec3) Load 267(f64v1)
-             281:149(f64vec3) ExtInst 1(GLSL.std.450) 9(Ceil) 280
-                              Store 266(f64v2) 281
-             282:149(f64vec3) Load 267(f64v1)
-             283:149(f64vec3) ExtInst 1(GLSL.std.450) 10(Fract) 282
-                              Store 266(f64v2) 283
-             284:149(f64vec3) Load 267(f64v1)
-             285:149(f64vec3) Load 266(f64v2)
-             286:149(f64vec3) FMod 284 285
-                              Store 266(f64v2) 286
-             287:149(f64vec3) Load 267(f64v1)
-             289:26(float64_t) Load 288(f64)
-             290:149(f64vec3) CompositeConstruct 289 289 289
-             291:149(f64vec3) FMod 287 290
-                              Store 266(f64v2) 291
-             293:149(f64vec3) Load 267(f64v1)
-             294:149(f64vec3) ExtInst 1(GLSL.std.450) 35(Modf) 293 266(f64v2)
-                              Store 292(f64v3) 294
-             295:149(f64vec3) Load 267(f64v1)
-             296:149(f64vec3) Load 266(f64v2)
-             297:149(f64vec3) ExtInst 1(GLSL.std.450) 37(FMin) 295 296
-                              Store 292(f64v3) 297
-             298:149(f64vec3) Load 267(f64v1)
-             299:26(float64_t) Load 288(f64)
-             300:149(f64vec3) CompositeConstruct 299 299 299
-             301:149(f64vec3) ExtInst 1(GLSL.std.450) 37(FMin) 298 300
-                              Store 292(f64v3) 301
-             302:149(f64vec3) Load 267(f64v1)
-             303:149(f64vec3) Load 266(f64v2)
-             304:149(f64vec3) ExtInst 1(GLSL.std.450) 40(FMax) 302 303
-                              Store 292(f64v3) 304
-             305:149(f64vec3) Load 267(f64v1)
-             306:26(float64_t) Load 288(f64)
-             307:149(f64vec3) CompositeConstruct 306 306 306
-             308:149(f64vec3) ExtInst 1(GLSL.std.450) 40(FMax) 305 307
-                              Store 292(f64v3) 308
-             309:149(f64vec3) Load 267(f64v1)
-             310:26(float64_t) Load 288(f64)
-             311:     33(ptr) AccessChain 266(f64v2) 32
-             312:26(float64_t) Load 311
-             313:149(f64vec3) CompositeConstruct 310 310 310
-             314:149(f64vec3) CompositeConstruct 312 312 312
-             315:149(f64vec3) ExtInst 1(GLSL.std.450) 43(FClamp) 309 313 314
-                              Store 292(f64v3) 315
-             316:149(f64vec3) Load 267(f64v1)
-             317:149(f64vec3) Load 266(f64v2)
-             318:26(float64_t) Load 288(f64)
-             319:149(f64vec3) CompositeConstruct 318 318 318
-             320:149(f64vec3) ExtInst 1(GLSL.std.450) 43(FClamp) 316 317 319
-                              Store 292(f64v3) 320
-             321:149(f64vec3) Load 267(f64v1)
-             322:149(f64vec3) Load 266(f64v2)
-             323:26(float64_t) Load 288(f64)
-             324:149(f64vec3) CompositeConstruct 323 323 323
-             325:149(f64vec3) ExtInst 1(GLSL.std.450) 46(FMix) 321 322 324
-                              Store 292(f64v3) 325
-             326:149(f64vec3) Load 267(f64v1)
-             327:149(f64vec3) Load 266(f64v2)
-             328:149(f64vec3) Load 292(f64v3)
-             329:149(f64vec3) ExtInst 1(GLSL.std.450) 46(FMix) 326 327 328
-                              Store 292(f64v3) 329
-             330:149(f64vec3) Load 267(f64v1)
-             331:149(f64vec3) Load 266(f64v2)
-             333:  152(bvec3) Load 332(bv)
-             334:149(f64vec3) Select 333 331 330
-                              Store 292(f64v3) 334
-             335:149(f64vec3) Load 267(f64v1)
-             336:149(f64vec3) Load 266(f64v2)
-             337:149(f64vec3) ExtInst 1(GLSL.std.450) 48(Step) 335 336
-                              Store 292(f64v3) 337
-             338:26(float64_t) Load 288(f64)
-             339:149(f64vec3) Load 292(f64v3)
-             340:149(f64vec3) CompositeConstruct 338 338 338
-             341:149(f64vec3) ExtInst 1(GLSL.std.450) 48(Step) 340 339
-                              Store 292(f64v3) 341
-             342:149(f64vec3) Load 267(f64v1)
-             343:149(f64vec3) Load 266(f64v2)
-             344:149(f64vec3) Load 292(f64v3)
-             345:149(f64vec3) ExtInst 1(GLSL.std.450) 49(SmoothStep) 342 343 344
-                              Store 292(f64v3) 345
-             346:26(float64_t) Load 288(f64)
-             347:     33(ptr) AccessChain 267(f64v1) 32
-             348:26(float64_t) Load 347
-             349:149(f64vec3) Load 266(f64v2)
-             350:149(f64vec3) CompositeConstruct 346 346 346
-             351:149(f64vec3) CompositeConstruct 348 348 348
-             352:149(f64vec3) ExtInst 1(GLSL.std.450) 49(SmoothStep) 350 351 349
-                              Store 292(f64v3) 352
-             354:26(float64_t) Load 288(f64)
-             355:   107(bool) IsNan 354
-                              Store 353(b) 355
-             356:149(f64vec3) Load 267(f64v1)
-             357:  152(bvec3) IsInf 356
-                              Store 332(bv) 357
-             358:149(f64vec3) Load 267(f64v1)
-             359:149(f64vec3) Load 266(f64v2)
-             360:149(f64vec3) Load 292(f64v3)
-             361:149(f64vec3) ExtInst 1(GLSL.std.450) 50(Fma) 358 359 360
-                              Store 292(f64v3) 361
-             362:149(f64vec3) Load 267(f64v1)
-             365:364(ResType) ExtInst 1(GLSL.std.450) 52(FrexpStruct) 362
-             366:  183(ivec3) CompositeExtract 365 1
-                              Store 363(iv) 366
-             367:149(f64vec3) CompositeExtract 365 0
-                              Store 266(f64v2) 367
-             368:149(f64vec3) Load 267(f64v1)
-             369:  183(ivec3) Load 363(iv)
-             370:149(f64vec3) ExtInst 1(GLSL.std.450) 53(Ldexp) 368 369
-                              Store 266(f64v2) 370
+      269(f64v2):    150(ptr) Variable Function
+      270(f64v1):    150(ptr) Variable Function
+        291(f64):     33(ptr) Variable Function
+      295(f64v3):    150(ptr) Variable Function
+         335(bv):    153(ptr) Variable Function
+          356(b):    108(ptr) Variable Function
+         366(iv):    184(ptr) Variable Function
+             271:149(f64vec3) Load 270(f64v1)
+             272:149(f64vec3) ExtInst 1(GLSL.std.450) 4(FAbs) 271
+                              Store 269(f64v2) 272
+             273:149(f64vec3) Load 270(f64v1)
+             274:149(f64vec3) ExtInst 1(GLSL.std.450) 6(FSign) 273
+                              Store 269(f64v2) 274
+             275:149(f64vec3) Load 270(f64v1)
+             276:149(f64vec3) ExtInst 1(GLSL.std.450) 8(Floor) 275
+                              Store 269(f64v2) 276
+             277:149(f64vec3) Load 270(f64v1)
+             278:149(f64vec3) ExtInst 1(GLSL.std.450) 3(Trunc) 277
+                              Store 269(f64v2) 278
+             279:149(f64vec3) Load 270(f64v1)
+             280:149(f64vec3) ExtInst 1(GLSL.std.450) 1(Round) 279
+                              Store 269(f64v2) 280
+             281:149(f64vec3) Load 270(f64v1)
+             282:149(f64vec3) ExtInst 1(GLSL.std.450) 2(RoundEven) 281
+                              Store 269(f64v2) 282
+             283:149(f64vec3) Load 270(f64v1)
+             284:149(f64vec3) ExtInst 1(GLSL.std.450) 9(Ceil) 283
+                              Store 269(f64v2) 284
+             285:149(f64vec3) Load 270(f64v1)
+             286:149(f64vec3) ExtInst 1(GLSL.std.450) 10(Fract) 285
+                              Store 269(f64v2) 286
+             287:149(f64vec3) Load 270(f64v1)
+             288:149(f64vec3) Load 269(f64v2)
+             289:149(f64vec3) FMod 287 288
+                              Store 269(f64v2) 289
+             290:149(f64vec3) Load 270(f64v1)
+             292:26(float64_t) Load 291(f64)
+             293:149(f64vec3) CompositeConstruct 292 292 292
+             294:149(f64vec3) FMod 290 293
+                              Store 269(f64v2) 294
+             296:149(f64vec3) Load 270(f64v1)
+             297:149(f64vec3) ExtInst 1(GLSL.std.450) 35(Modf) 296 269(f64v2)
+                              Store 295(f64v3) 297
+             298:149(f64vec3) Load 270(f64v1)
+             299:149(f64vec3) Load 269(f64v2)
+             300:149(f64vec3) ExtInst 1(GLSL.std.450) 37(FMin) 298 299
+                              Store 295(f64v3) 300
+             301:149(f64vec3) Load 270(f64v1)
+             302:26(float64_t) Load 291(f64)
+             303:149(f64vec3) CompositeConstruct 302 302 302
+             304:149(f64vec3) ExtInst 1(GLSL.std.450) 37(FMin) 301 303
+                              Store 295(f64v3) 304
+             305:149(f64vec3) Load 270(f64v1)
+             306:149(f64vec3) Load 269(f64v2)
+             307:149(f64vec3) ExtInst 1(GLSL.std.450) 40(FMax) 305 306
+                              Store 295(f64v3) 307
+             308:149(f64vec3) Load 270(f64v1)
+             309:26(float64_t) Load 291(f64)
+             310:149(f64vec3) CompositeConstruct 309 309 309
+             311:149(f64vec3) ExtInst 1(GLSL.std.450) 40(FMax) 308 310
+                              Store 295(f64v3) 311
+             312:149(f64vec3) Load 270(f64v1)
+             313:26(float64_t) Load 291(f64)
+             314:     33(ptr) AccessChain 269(f64v2) 32
+             315:26(float64_t) Load 314
+             316:149(f64vec3) CompositeConstruct 313 313 313
+             317:149(f64vec3) CompositeConstruct 315 315 315
+             318:149(f64vec3) ExtInst 1(GLSL.std.450) 43(FClamp) 312 316 317
+                              Store 295(f64v3) 318
+             319:149(f64vec3) Load 270(f64v1)
+             320:149(f64vec3) Load 269(f64v2)
+             321:26(float64_t) Load 291(f64)
+             322:149(f64vec3) CompositeConstruct 321 321 321
+             323:149(f64vec3) ExtInst 1(GLSL.std.450) 43(FClamp) 319 320 322
+                              Store 295(f64v3) 323
+             324:149(f64vec3) Load 270(f64v1)
+             325:149(f64vec3) Load 269(f64v2)
+             326:26(float64_t) Load 291(f64)
+             327:149(f64vec3) CompositeConstruct 326 326 326
+             328:149(f64vec3) ExtInst 1(GLSL.std.450) 46(FMix) 324 325 327
+                              Store 295(f64v3) 328
+             329:149(f64vec3) Load 270(f64v1)
+             330:149(f64vec3) Load 269(f64v2)
+             331:149(f64vec3) Load 295(f64v3)
+             332:149(f64vec3) ExtInst 1(GLSL.std.450) 46(FMix) 329 330 331
+                              Store 295(f64v3) 332
+             333:149(f64vec3) Load 270(f64v1)
+             334:149(f64vec3) Load 269(f64v2)
+             336:  152(bvec3) Load 335(bv)
+             337:149(f64vec3) Select 336 334 333
+                              Store 295(f64v3) 337
+             338:149(f64vec3) Load 270(f64v1)
+             339:149(f64vec3) Load 269(f64v2)
+             340:149(f64vec3) ExtInst 1(GLSL.std.450) 48(Step) 338 339
+                              Store 295(f64v3) 340
+             341:26(float64_t) Load 291(f64)
+             342:149(f64vec3) Load 295(f64v3)
+             343:149(f64vec3) CompositeConstruct 341 341 341
+             344:149(f64vec3) ExtInst 1(GLSL.std.450) 48(Step) 343 342
+                              Store 295(f64v3) 344
+             345:149(f64vec3) Load 270(f64v1)
+             346:149(f64vec3) Load 269(f64v2)
+             347:149(f64vec3) Load 295(f64v3)
+             348:149(f64vec3) ExtInst 1(GLSL.std.450) 49(SmoothStep) 345 346 347
+                              Store 295(f64v3) 348
+             349:26(float64_t) Load 291(f64)
+             350:     33(ptr) AccessChain 270(f64v1) 32
+             351:26(float64_t) Load 350
+             352:149(f64vec3) Load 269(f64v2)
+             353:149(f64vec3) CompositeConstruct 349 349 349
+             354:149(f64vec3) CompositeConstruct 351 351 351
+             355:149(f64vec3) ExtInst 1(GLSL.std.450) 49(SmoothStep) 353 354 352
+                              Store 295(f64v3) 355
+             357:26(float64_t) Load 291(f64)
+             358:   107(bool) IsNan 357
+                              Store 356(b) 358
+             359:149(f64vec3) Load 270(f64v1)
+             360:  152(bvec3) IsInf 359
+                              Store 335(bv) 360
+             361:149(f64vec3) Load 270(f64v1)
+             362:149(f64vec3) Load 269(f64v2)
+             363:149(f64vec3) Load 295(f64v3)
+             364:149(f64vec3) ExtInst 1(GLSL.std.450) 50(Fma) 361 362 363
+                              Store 295(f64v3) 364
+             365:149(f64vec3) Load 270(f64v1)
+             368:367(ResType) ExtInst 1(GLSL.std.450) 52(FrexpStruct) 365
+             369:  183(ivec3) CompositeExtract 368 1
+                              Store 366(iv) 369
+             370:149(f64vec3) CompositeExtract 368 0
+                              Store 269(f64v2) 370
+             371:149(f64vec3) Load 270(f64v1)
+             372:  183(ivec3) Load 366(iv)
+             373:149(f64vec3) ExtInst 1(GLSL.std.450) 53(Ldexp) 371 372
+                              Store 269(f64v2) 373
                               Return
                               FunctionEnd
 18(builtinGeometryFuncs():           2 Function None 3
               19:             Label
-        371(f64):     33(ptr) Variable Function
-      372(f64v1):    150(ptr) Variable Function
-      376(f64v2):    150(ptr) Variable Function
-      382(f64v3):    150(ptr) Variable Function
-             373:149(f64vec3) Load 372(f64v1)
-             374:26(float64_t) ExtInst 1(GLSL.std.450) 66(Length) 373
-                              Store 371(f64) 374
-             375:149(f64vec3) Load 372(f64v1)
-             377:149(f64vec3) Load 376(f64v2)
-             378:26(float64_t) ExtInst 1(GLSL.std.450) 67(Distance) 375 377
-                              Store 371(f64) 378
-             379:149(f64vec3) Load 372(f64v1)
-             380:149(f64vec3) Load 376(f64v2)
-             381:26(float64_t) Dot 379 380
-                              Store 371(f64) 381
-             383:149(f64vec3) Load 372(f64v1)
-             384:149(f64vec3) Load 376(f64v2)
-             385:149(f64vec3) ExtInst 1(GLSL.std.450) 68(Cross) 383 384
-                              Store 382(f64v3) 385
-             386:149(f64vec3) Load 372(f64v1)
-             387:149(f64vec3) ExtInst 1(GLSL.std.450) 69(Normalize) 386
-                              Store 376(f64v2) 387
-             388:149(f64vec3) Load 372(f64v1)
-             389:149(f64vec3) Load 376(f64v2)
-             390:149(f64vec3) Load 382(f64v3)
-             391:149(f64vec3) ExtInst 1(GLSL.std.450) 70(FaceForward) 388 389 390
-                              Store 382(f64v3) 391
-             392:149(f64vec3) Load 372(f64v1)
-             393:149(f64vec3) Load 376(f64v2)
-             394:149(f64vec3) ExtInst 1(GLSL.std.450) 71(Reflect) 392 393
-                              Store 382(f64v3) 394
-             395:149(f64vec3) Load 372(f64v1)
-             396:149(f64vec3) Load 376(f64v2)
-             397:26(float64_t) Load 371(f64)
-             398:149(f64vec3) ExtInst 1(GLSL.std.450) 72(Refract) 395 396 397
-                              Store 382(f64v3) 398
+        374(f64):     33(ptr) Variable Function
+      375(f64v1):    150(ptr) Variable Function
+      379(f64v2):    150(ptr) Variable Function
+      385(f64v3):    150(ptr) Variable Function
+             376:149(f64vec3) Load 375(f64v1)
+             377:26(float64_t) ExtInst 1(GLSL.std.450) 66(Length) 376
+                              Store 374(f64) 377
+             378:149(f64vec3) Load 375(f64v1)
+             380:149(f64vec3) Load 379(f64v2)
+             381:26(float64_t) ExtInst 1(GLSL.std.450) 67(Distance) 378 380
+                              Store 374(f64) 381
+             382:149(f64vec3) Load 375(f64v1)
+             383:149(f64vec3) Load 379(f64v2)
+             384:26(float64_t) Dot 382 383
+                              Store 374(f64) 384
+             386:149(f64vec3) Load 375(f64v1)
+             387:149(f64vec3) Load 379(f64v2)
+             388:149(f64vec3) ExtInst 1(GLSL.std.450) 68(Cross) 386 387
+                              Store 385(f64v3) 388
+             389:149(f64vec3) Load 375(f64v1)
+             390:149(f64vec3) ExtInst 1(GLSL.std.450) 69(Normalize) 389
+                              Store 379(f64v2) 390
+             391:149(f64vec3) Load 375(f64v1)
+             392:149(f64vec3) Load 379(f64v2)
+             393:149(f64vec3) Load 385(f64v3)
+             394:149(f64vec3) ExtInst 1(GLSL.std.450) 70(FaceForward) 391 392 393
+                              Store 385(f64v3) 394
+             395:149(f64vec3) Load 375(f64v1)
+             396:149(f64vec3) Load 379(f64v2)
+             397:149(f64vec3) ExtInst 1(GLSL.std.450) 71(Reflect) 395 396
+                              Store 385(f64v3) 397
+             398:149(f64vec3) Load 375(f64v1)
+             399:149(f64vec3) Load 379(f64v2)
+             400:26(float64_t) Load 374(f64)
+             401:149(f64vec3) ExtInst 1(GLSL.std.450) 72(Refract) 398 399 400
+                              Store 385(f64v3) 401
                               Return
                               FunctionEnd
 20(builtinMatrixFuncs():           2 Function None 3
               21:             Label
-      401(f64m3):    400(ptr) Variable Function
-      402(f64m1):    400(ptr) Variable Function
-      404(f64m2):    400(ptr) Variable Function
-      413(f64v1):    150(ptr) Variable Function
-      415(f64v2):     28(ptr) Variable Function
-      420(f64m4):    419(ptr) Variable Function
-        423(f64):     33(ptr) Variable Function
-      426(f64m5):    425(ptr) Variable Function
-      431(f64m6):    430(ptr) Variable Function
-      432(f64m7):    430(ptr) Variable Function
-             403:         399 Load 402(f64m1)
-             405:         399 Load 404(f64m2)
-             406:149(f64vec3) CompositeExtract 403 0
-             407:149(f64vec3) CompositeExtract 405 0
-             408:149(f64vec3) FMul 406 407
-             409:149(f64vec3) CompositeExtract 403 1
-             410:149(f64vec3) CompositeExtract 405 1
+      404(f64m3):    403(ptr) Variable Function
+      405(f64m1):    403(ptr) Variable Function
+      407(f64m2):    403(ptr) Variable Function
+      416(f64v1):    150(ptr) Variable Function
+      418(f64v2):     28(ptr) Variable Function
+      423(f64m4):    422(ptr) Variable Function
+        426(f64):     33(ptr) Variable Function
+      429(f64m5):    428(ptr) Variable Function
+      434(f64m6):    433(ptr) Variable Function
+      435(f64m7):    433(ptr) Variable Function
+             406:         402 Load 405(f64m1)
+             408:         402 Load 407(f64m2)
+             409:149(f64vec3) CompositeExtract 406 0
+             410:149(f64vec3) CompositeExtract 408 0
              411:149(f64vec3) FMul 409 410
-             412:         399 CompositeConstruct 408 411
-                              Store 401(f64m3) 412
-             414:149(f64vec3) Load 413(f64v1)
-             416: 27(f64vec2) Load 415(f64v2)
-             417:         399 OuterProduct 414 416
-                              Store 402(f64m1) 417
-             421:         399 Load 402(f64m1)
-             422:         418 Transpose 421
-                              Store 420(f64m4) 422
-             427:         424 Load 426(f64m5)
-             428:26(float64_t) ExtInst 1(GLSL.std.450) 33(Determinant) 427
-                              Store 423(f64) 428
-             433:         429 Load 432(f64m7)
-             434:         429 ExtInst 1(GLSL.std.450) 34(MatrixInverse) 433
-                              Store 431(f64m6) 434
+             412:149(f64vec3) CompositeExtract 406 1
+             413:149(f64vec3) CompositeExtract 408 1
+             414:149(f64vec3) FMul 412 413
+             415:         402 CompositeConstruct 411 414
+                              Store 404(f64m3) 415
+             417:149(f64vec3) Load 416(f64v1)
+             419: 27(f64vec2) Load 418(f64v2)
+             420:         402 OuterProduct 417 419
+                              Store 405(f64m1) 420
+             424:         402 Load 405(f64m1)
+             425:         421 Transpose 424
+                              Store 423(f64m4) 425
+             430:         427 Load 429(f64m5)
+             431:26(float64_t) ExtInst 1(GLSL.std.450) 33(Determinant) 430
+                              Store 426(f64) 431
+             436:         432 Load 435(f64m7)
+             437:         432 ExtInst 1(GLSL.std.450) 34(MatrixInverse) 436
+                              Store 434(f64m6) 437
                               Return
                               FunctionEnd
 22(builtinVecRelFuncs():           2 Function None 3
               23:             Label
-         435(bv):    153(ptr) Variable Function
-      436(f64v1):    150(ptr) Variable Function
-      438(f64v2):    150(ptr) Variable Function
-             437:149(f64vec3) Load 436(f64v1)
-             439:149(f64vec3) Load 438(f64v2)
-             440:  152(bvec3) FOrdLessThan 437 439
-                              Store 435(bv) 440
-             441:149(f64vec3) Load 436(f64v1)
-             442:149(f64vec3) Load 438(f64v2)
-             443:  152(bvec3) FOrdLessThanEqual 441 442
-                              Store 435(bv) 443
-             444:149(f64vec3) Load 436(f64v1)
-             445:149(f64vec3) Load 438(f64v2)
-             446:  152(bvec3) FOrdGreaterThan 444 445
-                              Store 435(bv) 446
-             447:149(f64vec3) Load 436(f64v1)
-             448:149(f64vec3) Load 438(f64v2)
-             449:  152(bvec3) FOrdGreaterThanEqual 447 448
-                              Store 435(bv) 449
-             450:149(f64vec3) Load 436(f64v1)
-             451:149(f64vec3) Load 438(f64v2)
-             452:  152(bvec3) FOrdEqual 450 451
-                              Store 435(bv) 452
-             453:149(f64vec3) Load 436(f64v1)
-             454:149(f64vec3) Load 438(f64v2)
-             455:  152(bvec3) FOrdNotEqual 453 454
-                              Store 435(bv) 455
+         438(bv):    153(ptr) Variable Function
+      439(f64v1):    150(ptr) Variable Function
+      441(f64v2):    150(ptr) Variable Function
+             440:149(f64vec3) Load 439(f64v1)
+             442:149(f64vec3) Load 441(f64v2)
+             443:  152(bvec3) FOrdLessThan 440 442
+                              Store 438(bv) 443
+             444:149(f64vec3) Load 439(f64v1)
+             445:149(f64vec3) Load 441(f64v2)
+             446:  152(bvec3) FOrdLessThanEqual 444 445
+                              Store 438(bv) 446
+             447:149(f64vec3) Load 439(f64v1)
+             448:149(f64vec3) Load 441(f64v2)
+             449:  152(bvec3) FOrdGreaterThan 447 448
+                              Store 438(bv) 449
+             450:149(f64vec3) Load 439(f64v1)
+             451:149(f64vec3) Load 441(f64v2)
+             452:  152(bvec3) FOrdGreaterThanEqual 450 451
+                              Store 438(bv) 452
+             453:149(f64vec3) Load 439(f64v1)
+             454:149(f64vec3) Load 441(f64v2)
+             455:  152(bvec3) FOrdEqual 453 454
+                              Store 438(bv) 455
+             456:149(f64vec3) Load 439(f64v1)
+             457:149(f64vec3) Load 441(f64v2)
+             458:  152(bvec3) FOrdNotEqual 456 457
+                              Store 438(bv) 458
                               Return
                               FunctionEnd
 24(builtinFragProcFuncs():           2 Function None 3
               25:             Label
-       456(f64v):    150(ptr) Variable Function
-             460:    459(ptr) AccessChain 458(if64v) 32
-             461:26(float64_t) Load 460
-             462:26(float64_t) DPdx 461
-             463:     33(ptr) AccessChain 456(f64v) 32
-                              Store 463 462
-             464:    459(ptr) AccessChain 458(if64v) 88
-             465:26(float64_t) Load 464
-             466:26(float64_t) DPdy 465
-             467:     33(ptr) AccessChain 456(f64v) 88
-                              Store 467 466
-             468:149(f64vec3) Load 458(if64v)
-             469: 27(f64vec2) VectorShuffle 468 468 0 1
-             470: 27(f64vec2) DPdxFine 469
-             471:149(f64vec3) Load 456(f64v)
-             472:149(f64vec3) VectorShuffle 471 470 3 4 2
-                              Store 456(f64v) 472
-             473:149(f64vec3) Load 458(if64v)
-             474: 27(f64vec2) VectorShuffle 473 473 0 1
-             475: 27(f64vec2) DPdyFine 474
-             476:149(f64vec3) Load 456(f64v)
-             477:149(f64vec3) VectorShuffle 476 475 3 4 2
-                              Store 456(f64v) 477
-             478:149(f64vec3) Load 458(if64v)
-             479:149(f64vec3) DPdxCoarse 478
-                              Store 456(f64v) 479
-             480:149(f64vec3) Load 458(if64v)
-             481:149(f64vec3) DPdxCoarse 480
-                              Store 456(f64v) 481
-             482:    459(ptr) AccessChain 458(if64v) 32
-             483:26(float64_t) Load 482
-             484:26(float64_t) Fwidth 483
-             485:     33(ptr) AccessChain 456(f64v) 32
-                              Store 485 484
-             486:149(f64vec3) Load 458(if64v)
-             487: 27(f64vec2) VectorShuffle 486 486 0 1
-             488: 27(f64vec2) FwidthFine 487
-             489:149(f64vec3) Load 456(f64v)
-             490:149(f64vec3) VectorShuffle 489 488 3 4 2
-                              Store 456(f64v) 490
-             491:149(f64vec3) Load 458(if64v)
-             492:149(f64vec3) FwidthCoarse 491
-                              Store 456(f64v) 492
-             493:    459(ptr) AccessChain 458(if64v) 32
-             494:26(float64_t) ExtInst 1(GLSL.std.450) 76(InterpolateAtCentroid) 493
-             495:     33(ptr) AccessChain 456(f64v) 32
-                              Store 495 494
-             497:149(f64vec3) ExtInst 1(GLSL.std.450) 77(InterpolateAtSample) 458(if64v) 496
-             498: 27(f64vec2) VectorShuffle 497 497 0 1
-             499:149(f64vec3) Load 456(f64v)
-             500:149(f64vec3) VectorShuffle 499 498 3 4 2
-                              Store 456(f64v) 500
-             503:149(f64vec3) ExtInst 1(GLSL.std.450) 78(InterpolateAtOffset) 458(if64v) 502
-                              Store 456(f64v) 503
+       459(f64v):    150(ptr) Variable Function
+             463:    462(ptr) AccessChain 461(if64v) 32
+             464:26(float64_t) Load 463
+             465:26(float64_t) DPdx 464
+             466:     33(ptr) AccessChain 459(f64v) 32
+                              Store 466 465
+             467:    462(ptr) AccessChain 461(if64v) 88
+             468:26(float64_t) Load 467
+             469:26(float64_t) DPdy 468
+             470:     33(ptr) AccessChain 459(f64v) 88
+                              Store 470 469
+             471:149(f64vec3) Load 461(if64v)
+             472: 27(f64vec2) VectorShuffle 471 471 0 1
+             473: 27(f64vec2) DPdxFine 472
+             474:149(f64vec3) Load 459(f64v)
+             475:149(f64vec3) VectorShuffle 474 473 3 4 2
+                              Store 459(f64v) 475
+             476:149(f64vec3) Load 461(if64v)
+             477: 27(f64vec2) VectorShuffle 476 476 0 1
+             478: 27(f64vec2) DPdyFine 477
+             479:149(f64vec3) Load 459(f64v)
+             480:149(f64vec3) VectorShuffle 479 478 3 4 2
+                              Store 459(f64v) 480
+             481:149(f64vec3) Load 461(if64v)
+             482:149(f64vec3) DPdxCoarse 481
+                              Store 459(f64v) 482
+             483:149(f64vec3) Load 461(if64v)
+             484:149(f64vec3) DPdxCoarse 483
+                              Store 459(f64v) 484
+             485:    462(ptr) AccessChain 461(if64v) 32
+             486:26(float64_t) Load 485
+             487:26(float64_t) Fwidth 486
+             488:     33(ptr) AccessChain 459(f64v) 32
+                              Store 488 487
+             489:149(f64vec3) Load 461(if64v)
+             490: 27(f64vec2) VectorShuffle 489 489 0 1
+             491: 27(f64vec2) FwidthFine 490
+             492:149(f64vec3) Load 459(f64v)
+             493:149(f64vec3) VectorShuffle 492 491 3 4 2
+                              Store 459(f64v) 493
+             494:149(f64vec3) Load 461(if64v)
+             495:149(f64vec3) FwidthCoarse 494
+                              Store 459(f64v) 495
+             496:    462(ptr) AccessChain 461(if64v) 32
+             497:26(float64_t) ExtInst 1(GLSL.std.450) 76(InterpolateAtCentroid) 496
+             498:     33(ptr) AccessChain 459(f64v) 32
+                              Store 498 497
+             500:149(f64vec3) ExtInst 1(GLSL.std.450) 77(InterpolateAtSample) 461(if64v) 499
+             501: 27(f64vec2) VectorShuffle 500 500 0 1
+             502:149(f64vec3) Load 459(f64v)
+             503:149(f64vec3) VectorShuffle 502 501 3 4 2
+                              Store 459(f64v) 503
+             506:149(f64vec3) ExtInst 1(GLSL.std.450) 78(InterpolateAtOffset) 461(if64v) 505
+                              Store 459(f64v) 506
                               Return
                               FunctionEnd

3rdparty/glslang/Test/baseResults/spv.int8.frag.out

@@ -1,7 +1,7 @@
 spv.int8.frag
 // Module Version 10300
 // Generated by (magic number): 80007
-// Id's are bound by 531
+// Id's are bound by 518
 
                               Capability Shader
                               Capability Float16
@@ -9,6 +9,8 @@ spv.int8.frag
                               Capability Int64
                               Capability Int16
                               Capability Int8
+                              Capability CapabilityUniformAndStorageBuffer8BitAccess
+                              Extension  "SPV_KHR_8bit_storage"
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main"
@@ -47,52 +49,52 @@ spv.int8.frag
                               Name 144  "u16v"
                               Name 174  "bv"
                               Name 192  "u8v"
-                              Name 196  "i8"
-                              Name 216  "i"
-                              Name 223  "uv"
-                              Name 242  "i16"
-                              Name 279  "b"
-                              Name 341  "i8v"
-                              Name 344  "i8"
-                              Name 354  "u8v"
-                              Name 356  "u8"
-                              Name 430  "i16"
-                              Name 433  "i32"
-                              Name 436  "i8v4"
-                              Name 440  "u16"
-                              Name 441  "u8v2"
-                              Name 444  "u32"
-                              Name 447  "u8v4"
-                              Name 459  "bv"
-                              Name 526  "Block"
-                              MemberName 526(Block) 0  "i8"
-                              MemberName 526(Block) 1  "i8v2"
-                              MemberName 526(Block) 2  "i8v3"
-                              MemberName 526(Block) 3  "i8v4"
-                              MemberName 526(Block) 4  "u8"
-                              MemberName 526(Block) 5  "u8v2"
-                              MemberName 526(Block) 6  "u8v3"
-                              MemberName 526(Block) 7  "u8v4"
-                              Name 528  "block"
-                              Name 529  "si8"
-                              Name 530  "su8"
+                              Name 197  "i8"
+                              Name 217  "i"
+                              Name 224  "uv"
+                              Name 240  "i16"
+                              Name 276  "b"
+                              Name 338  "i8v"
+                              Name 341  "i8"
+                              Name 351  "u8v"
+                              Name 353  "u8"
+                              Name 423  "i16"
+                              Name 426  "i32"
+                              Name 429  "i8v4"
+                              Name 433  "u16"
+                              Name 434  "u8v2"
+                              Name 437  "u32"
+                              Name 440  "u8v4"
+                              Name 452  "bv"
+                              Name 513  "Block"
+                              MemberName 513(Block) 0  "i8"
+                              MemberName 513(Block) 1  "i8v2"
+                              MemberName 513(Block) 2  "i8v3"
+                              MemberName 513(Block) 3  "i8v4"
+                              MemberName 513(Block) 4  "u8"
+                              MemberName 513(Block) 5  "u8v2"
+                              MemberName 513(Block) 6  "u8v3"
+                              MemberName 513(Block) 7  "u8v4"
+                              Name 515  "block"
+                              Name 516  "si8"
+                              Name 517  "su8"
                               MemberDecorate 24(Uniforms) 0 Offset 0
                               Decorate 24(Uniforms) Block
                               Decorate 26 DescriptorSet 0
                               Decorate 26 Binding 0
-                              MemberDecorate 526(Block) 0 Offset 0
-                              MemberDecorate 526(Block) 1 Offset 2
-                              MemberDecorate 526(Block) 2 Offset 4
-                              MemberDecorate 526(Block) 3 Offset 8
-                              MemberDecorate 526(Block) 4 Offset 12
-                              MemberDecorate 526(Block) 5 Offset 14
-                              MemberDecorate 526(Block) 6 Offset 16
-                              MemberDecorate 526(Block) 7 Offset 20
-                              Decorate 526(Block) Block
-                              Decorate 528(block) DescriptorSet 0
-                              Decorate 528(block) Binding 1
-                              Decorate 529(si8) SpecId 100
-                              Decorate 530(su8) SpecId 101
+                              MemberDecorate 513(Block) 0 Offset 0
+                              MemberDecorate 513(Block) 1 Offset 2
+                              MemberDecorate 513(Block) 2 Offset 4
+                              MemberDecorate 513(Block) 3 Offset 8
+                              MemberDecorate 513(Block) 4 Offset 12
+                              MemberDecorate 513(Block) 5 Offset 14
+                              MemberDecorate 513(Block) 6 Offset 16
+                              MemberDecorate 513(Block) 7 Offset 20
+                              Decorate 513(Block) Block
+                              Decorate 515(block) DescriptorSet 0
+                              Decorate 515(block) Binding 1
+                              Decorate 516(si8) SpecId 100
+                              Decorate 517(su8) SpecId 101
                2:             TypeVoid
                3:             TypeFunction 2
               14:             TypeInt 8 1
@@ -157,37 +159,36 @@ spv.int8.frag
              182:  36(int8_t) Constant 1
              183:  49(i8vec2) ConstantComposite 181 181
              184:  49(i8vec2) ConstantComposite 182 182
-             190:             TypeVector 14(int8_t) 3
+             190:             TypeVector 36(int8_t) 3
              191:             TypePointer Function 190(i8vec3)
-             215:             TypePointer Function 27(int)
-             221:             TypeVector 17(int) 3
-             222:             TypePointer Function 221(ivec3)
-             225:             TypeVector 27(int) 3
-             241:             TypePointer Function 57(int16_t)
-             264:     17(int) Constant 1
-             270:     17(int) Constant 2
-             278:             TypePointer Function 171(bool)
-             280:     17(int) Constant 0
-             293:             TypePointer Function 17(int)
-             352:  52(i8vec2) ConstantComposite 21 21
-             358:             TypeVector 36(int8_t) 3
-             362: 190(i8vec3) ConstantComposite 22 22 22
-             404:   171(bool) ConstantTrue
-             411:   171(bool) ConstantFalse
-             412:  172(bvec2) ConstantComposite 411 411
-             427:             TypeVector 171(bool) 3
-             428:  427(bvec3) ConstantComposite 411 411 411
-             434:             TypeVector 14(int8_t) 4
-             435:             TypePointer Function 434(i8vec4)
-             439:             TypePointer Function 64(int16_t)
-             445:             TypeVector 36(int8_t) 4
-             446:             TypePointer Function 445(i8vec4)
-             458:             TypePointer Function 427(bvec3)
-      526(Block):             TypeStruct 14(int8_t) 52(i8vec2) 190(i8vec3) 434(i8vec4) 36(int8_t) 49(i8vec2) 190(i8vec3) 445(i8vec4)
-             527:             TypePointer Uniform 526(Block)
-      528(block):    527(ptr) Variable Uniform
-        529(si8):  14(int8_t) SpecConstant 4294967286
-        530(su8):  36(int8_t) SpecConstant 20
+             194:             TypeVector 14(int8_t) 3
+             216:             TypePointer Function 27(int)
+             222:             TypeVector 17(int) 3
+             223:             TypePointer Function 222(ivec3)
+             239:             TypePointer Function 57(int16_t)
+             261:     17(int) Constant 1
+             267:     17(int) Constant 2
+             275:             TypePointer Function 171(bool)
+             277:     17(int) Constant 0
+             291:             TypePointer Function 17(int)
+             349:  52(i8vec2) ConstantComposite 21 21
+             358: 190(i8vec3) ConstantComposite 181 181 181
+             400:   171(bool) ConstantTrue
+             407:   171(bool) ConstantFalse
+             408:  172(bvec2) ConstantComposite 407 407
+             420:             TypeVector 171(bool) 3
+             421:  420(bvec3) ConstantComposite 407 407 407
+             427:             TypeVector 14(int8_t) 4
+             428:             TypePointer Function 427(i8vec4)
+             432:             TypePointer Function 64(int16_t)
+             438:             TypeVector 36(int8_t) 4
+             439:             TypePointer Function 438(i8vec4)
+             451:             TypePointer Function 420(bvec3)
+      513(Block):             TypeStruct 14(int8_t) 52(i8vec2) 194(i8vec3) 427(i8vec4) 36(int8_t) 49(i8vec2) 190(i8vec3) 438(i8vec4)
+             514:             TypePointer Uniform 513(Block)
+      515(block):    514(ptr) Variable Uniform
+        516(si8):  14(int8_t) SpecConstant 4294967286
+        517(su8):  36(int8_t) SpecConstant 20
          4(main):           2 Function None 3
                5:             Label
                               Return
@@ -360,389 +361,377 @@ spv.int8.frag
   10(operators():           2 Function None 3
               11:             Label
         192(u8v):    191(ptr) Variable Function
-         196(i8):     15(ptr) Variable Function
-          216(i):    215(ptr) Variable Function
-         223(uv):    222(ptr) Variable Function
-        242(i16):    241(ptr) Variable Function
-          279(b):    278(ptr) Variable Function
+         197(i8):     15(ptr) Variable Function
+          217(i):    216(ptr) Variable Function
+         224(uv):    223(ptr) Variable Function
+        240(i16):    239(ptr) Variable Function
+          276(b):    275(ptr) Variable Function
              193: 190(i8vec3) Load 192(u8v)
-             194: 190(i8vec3) CompositeConstruct 176 176 176
-             195: 190(i8vec3) IAdd 193 194
-                              Store 192(u8v) 195
-             197:  14(int8_t) Load 196(i8)
-             198:  14(int8_t) ISub 197 176
-                              Store 196(i8) 198
-             199:  14(int8_t) Load 196(i8)
-             200:  14(int8_t) IAdd 199 176
-                              Store 196(i8) 200
-             201: 190(i8vec3) Load 192(u8v)
-             202: 190(i8vec3) CompositeConstruct 176 176 176
-             203: 190(i8vec3) ISub 201 202
-                              Store 192(u8v) 203
-             204: 190(i8vec3) Load 192(u8v)
-             205: 190(i8vec3) Not 204
-                              Store 192(u8v) 205
-             206:  14(int8_t) Load 196(i8)
-                              Store 196(i8) 206
-             207: 190(i8vec3) Load 192(u8v)
-             208: 190(i8vec3) SNegate 207
-                              Store 192(u8v) 208
-             209:  14(int8_t) Load 196(i8)
-             210:  14(int8_t) Load 196(i8)
-             211:  14(int8_t) IAdd 210 209
-                              Store 196(i8) 211
-             212: 190(i8vec3) Load 192(u8v)
+             195: 194(i8vec3) CompositeConstruct 176 176 176
+             196: 190(i8vec3) IAdd 193 195
+                              Store 192(u8v) 196
+             198:  14(int8_t) Load 197(i8)
+             199:  14(int8_t) ISub 198 176
+                              Store 197(i8) 199
+             200:  14(int8_t) Load 197(i8)
+             201:  14(int8_t) IAdd 200 176
+                              Store 197(i8) 201
+             202: 190(i8vec3) Load 192(u8v)
+             203: 194(i8vec3) CompositeConstruct 176 176 176
+             204: 190(i8vec3) ISub 202 203
+                              Store 192(u8v) 204
+             205: 190(i8vec3) Load 192(u8v)
+             206: 190(i8vec3) Not 205
+                              Store 192(u8v) 206
+             207:  14(int8_t) Load 197(i8)
+                              Store 197(i8) 207
+             208: 190(i8vec3) Load 192(u8v)
+             209: 190(i8vec3) SNegate 208
+                              Store 192(u8v) 209
+             210:  14(int8_t) Load 197(i8)
+             211:  14(int8_t) Load 197(i8)
+             212:  14(int8_t) IAdd 211 210
+                              Store 197(i8) 212
              213: 190(i8vec3) Load 192(u8v)
-             214: 190(i8vec3) ISub 213 212
-                              Store 192(u8v) 214
-             217:  14(int8_t) Load 196(i8)
-             218:     27(int) SConvert 217
-             219:     27(int) Load 216(i)
-             220:     27(int) IMul 219 218
-                              Store 216(i) 220
-             224: 190(i8vec3) Load 192(u8v)
-             226:  225(ivec3) SConvert 224
-             227:  221(ivec3) Bitcast 226
-             228:  221(ivec3) Load 223(uv)
-             229:  221(ivec3) UDiv 228 227
-                              Store 223(uv) 229
-             230:  14(int8_t) Load 196(i8)
-             231:     27(int) SConvert 230
-             232:     17(int) Bitcast 231
-             233:  221(ivec3) Load 223(uv)
-             234:  221(ivec3) CompositeConstruct 232 232 232
-             235:  221(ivec3) UMod 233 234
-                              Store 223(uv) 235
-             236: 190(i8vec3) Load 192(u8v)
-             237:  225(ivec3) SConvert 236
-             238:  221(ivec3) Bitcast 237
-             239:  221(ivec3) Load 223(uv)
-             240:  221(ivec3) IAdd 238 239
-                              Store 223(uv) 240
-             243:  14(int8_t) Load 196(i8)
-             244: 57(int16_t) SConvert 243
-             245: 57(int16_t) Load 242(i16)
-             246: 57(int16_t) ISub 244 245
-                              Store 242(i16) 246
-             247: 190(i8vec3) Load 192(u8v)
-             248:  225(ivec3) SConvert 247
-             249:  221(ivec3) Bitcast 248
-             250:  221(ivec3) Load 223(uv)
-             251:  221(ivec3) IMul 249 250
-                              Store 223(uv) 251
-             252:  14(int8_t) Load 196(i8)
-             253: 57(int16_t) SConvert 252
-             254: 57(int16_t) Load 242(i16)
-             255: 57(int16_t) IMul 253 254
-                              Store 242(i16) 255
-             256:  14(int8_t) Load 196(i8)
-             257:     27(int) SConvert 256
-             258:     27(int) Load 216(i)
-             259:     27(int) SMod 257 258
-                              Store 216(i) 259
-             260:  14(int8_t) Load 196(i8)
-             261: 190(i8vec3) Load 192(u8v)
-             262: 190(i8vec3) CompositeConstruct 260 260 260
-             263: 190(i8vec3) ShiftLeftLogical 261 262
-                              Store 192(u8v) 263
-             265:     15(ptr) AccessChain 192(u8v) 264
-             266:  14(int8_t) Load 265
-             267:  14(int8_t) Load 196(i8)
-             268:  14(int8_t) ShiftRightArithmetic 267 266
-                              Store 196(i8) 268
-             269:  14(int8_t) Load 196(i8)
-             271:     15(ptr) AccessChain 192(u8v) 270
-             272:  14(int8_t) Load 271
-             273:  14(int8_t) ShiftLeftLogical 269 272
-                              Store 196(i8) 273
-             274: 190(i8vec3) Load 192(u8v)
-             275:  14(int8_t) Load 196(i8)
-             276: 190(i8vec3) CompositeConstruct 275 275 275
-             277: 190(i8vec3) ShiftLeftLogical 274 276
-                              Store 192(u8v) 277
-             281:     15(ptr) AccessChain 192(u8v) 280
-             282:  14(int8_t) Load 281
-             283:  14(int8_t) Load 196(i8)
-             284:   171(bool) INotEqual 282 283
-                              Store 279(b) 284
-             285:  14(int8_t) Load 196(i8)
-             286:     15(ptr) AccessChain 192(u8v) 280
-             287:  14(int8_t) Load 286
-             288:   171(bool) IEqual 285 287
-                              Store 279(b) 288
-             289:     15(ptr) AccessChain 192(u8v) 280
-             290:  14(int8_t) Load 289
-             291:     27(int) SConvert 290
-             292:     17(int) Bitcast 291
-             294:    293(ptr) AccessChain 223(uv) 264
-             295:     17(int) Load 294
-             296:   171(bool) UGreaterThan 292 295
-                              Store 279(b) 296
-             297:  14(int8_t) Load 196(i8)
-             298:     27(int) SConvert 297
-             299:     27(int) Load 216(i)
-             300:   171(bool) SLessThan 298 299
-                              Store 279(b) 300
-             301:     15(ptr) AccessChain 192(u8v) 264
-             302:  14(int8_t) Load 301
-             303:     27(int) SConvert 302
-             304:     17(int) Bitcast 303
-             305:    293(ptr) AccessChain 223(uv) 280
-             306:     17(int) Load 305
-             307:   171(bool) UGreaterThanEqual 304 306
-                              Store 279(b) 307
-             308:  14(int8_t) Load 196(i8)
-             309:     27(int) SConvert 308
-             310:     27(int) Load 216(i)
-             311:   171(bool) SLessThanEqual 309 310
-                              Store 279(b) 311
-             312:  14(int8_t) Load 196(i8)
-             313:     27(int) SConvert 312
-             314:     17(int) Bitcast 313
-             315:  221(ivec3) Load 223(uv)
-             316:  221(ivec3) CompositeConstruct 314 314 314
-             317:  221(ivec3) BitwiseOr 315 316
-                              Store 223(uv) 317
-             318:  14(int8_t) Load 196(i8)
-             319:     27(int) SConvert 318
-             320:     27(int) Load 216(i)
-             321:     27(int) BitwiseOr 319 320
-                              Store 216(i) 321
-             322:  14(int8_t) Load 196(i8)
-             323: 57(int16_t) SConvert 322
-             324: 57(int16_t) Load 242(i16)
-             325: 57(int16_t) BitwiseAnd 324 323
-                              Store 242(i16) 325
-             326: 190(i8vec3) Load 192(u8v)
-             327:  225(ivec3) SConvert 326
-             328:  221(ivec3) Bitcast 327
-             329:  221(ivec3) Load 223(uv)
-             330:  221(ivec3) BitwiseAnd 328 329
-                              Store 223(uv) 330
-             331:  14(int8_t) Load 196(i8)
-             332:     27(int) SConvert 331
-             333:     17(int) Bitcast 332
-             334:  221(ivec3) Load 223(uv)
-             335:  221(ivec3) CompositeConstruct 333 333 333
-             336:  221(ivec3) BitwiseXor 334 335
-                              Store 223(uv) 336
-             337: 190(i8vec3) Load 192(u8v)
-             338:  14(int8_t) Load 196(i8)
-             339: 190(i8vec3) CompositeConstruct 338 338 338
-             340: 190(i8vec3) BitwiseXor 337 339
-                              Store 192(u8v) 340
+             214: 190(i8vec3) Load 192(u8v)
+             215: 190(i8vec3) ISub 214 213
+                              Store 192(u8v) 215
+             218:  14(int8_t) Load 197(i8)
+             219:     27(int) SConvert 218
+             220:     27(int) Load 217(i)
+             221:     27(int) IMul 220 219
+                              Store 217(i) 221
+             225: 190(i8vec3) Load 192(u8v)
+             226:  222(ivec3) UConvert 225
+             227:  222(ivec3) Load 224(uv)
+             228:  222(ivec3) UDiv 227 226
+                              Store 224(uv) 228
+             229:  14(int8_t) Load 197(i8)
+             230:     27(int) SConvert 229
+             231:     17(int) Bitcast 230
+             232:  222(ivec3) Load 224(uv)
+             233:  222(ivec3) CompositeConstruct 231 231 231
+             234:  222(ivec3) UMod 232 233
+                              Store 224(uv) 234
+             235: 190(i8vec3) Load 192(u8v)
+             236:  222(ivec3) UConvert 235
+             237:  222(ivec3) Load 224(uv)
+             238:  222(ivec3) IAdd 236 237
+                              Store 224(uv) 238
+             241:  14(int8_t) Load 197(i8)
+             242: 57(int16_t) SConvert 241
+             243: 57(int16_t) Load 240(i16)
+             244: 57(int16_t) ISub 242 243
+                              Store 240(i16) 244
+             245: 190(i8vec3) Load 192(u8v)
+             246:  222(ivec3) UConvert 245
+             247:  222(ivec3) Load 224(uv)
+             248:  222(ivec3) IMul 246 247
+                              Store 224(uv) 248
+             249:  14(int8_t) Load 197(i8)
+             250: 57(int16_t) SConvert 249
+             251: 57(int16_t) Load 240(i16)
+             252: 57(int16_t) IMul 250 251
+                              Store 240(i16) 252
+             253:  14(int8_t) Load 197(i8)
+             254:     27(int) SConvert 253
+             255:     27(int) Load 217(i)
+             256:     27(int) SMod 254 255
+                              Store 217(i) 256
+             257:  14(int8_t) Load 197(i8)
+             258: 190(i8vec3) Load 192(u8v)
+             259: 194(i8vec3) CompositeConstruct 257 257 257
+             260: 190(i8vec3) ShiftLeftLogical 258 259
+                              Store 192(u8v) 260
+             262:     37(ptr) AccessChain 192(u8v) 261
+             263:  36(int8_t) Load 262
+             264:  14(int8_t) Load 197(i8)
+             265:  14(int8_t) ShiftRightArithmetic 264 263
+                              Store 197(i8) 265
+             266:  14(int8_t) Load 197(i8)
+             268:     37(ptr) AccessChain 192(u8v) 267
+             269:  36(int8_t) Load 268
+             270:  14(int8_t) ShiftLeftLogical 266 269
+                              Store 197(i8) 270
+             271: 190(i8vec3) Load 192(u8v)
+             272:  14(int8_t) Load 197(i8)
+             273: 194(i8vec3) CompositeConstruct 272 272 272
+             274: 190(i8vec3) ShiftLeftLogical 271 273
+                              Store 192(u8v) 274
+             278:     37(ptr) AccessChain 192(u8v) 277
+             279:  36(int8_t) Load 278
+             280:  14(int8_t) Load 197(i8)
+             281:  36(int8_t) Bitcast 280
+             282:   171(bool) INotEqual 279 281
+                              Store 276(b) 282
+             283:  14(int8_t) Load 197(i8)
+             284:  36(int8_t) Bitcast 283
+             285:     37(ptr) AccessChain 192(u8v) 277
+             286:  36(int8_t) Load 285
+             287:   171(bool) IEqual 284 286
+                              Store 276(b) 287
+             288:     37(ptr) AccessChain 192(u8v) 277
+             289:  36(int8_t) Load 288
+             290:     17(int) UConvert 289
+             292:    291(ptr) AccessChain 224(uv) 261
+             293:     17(int) Load 292
+             294:   171(bool) UGreaterThan 290 293
+                              Store 276(b) 294
+             295:  14(int8_t) Load 197(i8)
+             296:     27(int) SConvert 295
+             297:     27(int) Load 217(i)
+             298:   171(bool) SLessThan 296 297
+                              Store 276(b) 298
+             299:     37(ptr) AccessChain 192(u8v) 261
+             300:  36(int8_t) Load 299
+             301:     17(int) UConvert 300
+             302:    291(ptr) AccessChain 224(uv) 277
+             303:     17(int) Load 302
+             304:   171(bool) UGreaterThanEqual 301 303
+                              Store 276(b) 304
+             305:  14(int8_t) Load 197(i8)
+             306:     27(int) SConvert 305
+             307:     27(int) Load 217(i)
+             308:   171(bool) SLessThanEqual 306 307
+                              Store 276(b) 308
+             309:  14(int8_t) Load 197(i8)
+             310:     27(int) SConvert 309
+             311:     17(int) Bitcast 310
+             312:  222(ivec3) Load 224(uv)
+             313:  222(ivec3) CompositeConstruct 311 311 311
+             314:  222(ivec3) BitwiseOr 312 313
+                              Store 224(uv) 314
+             315:  14(int8_t) Load 197(i8)
+             316:     27(int) SConvert 315
+             317:     27(int) Load 217(i)
+             318:     27(int) BitwiseOr 316 317
+                              Store 217(i) 318
+             319:  14(int8_t) Load 197(i8)
+             320: 57(int16_t) SConvert 319
+             321: 57(int16_t) Load 240(i16)
+             322: 57(int16_t) BitwiseAnd 321 320
+                              Store 240(i16) 322
+             323: 190(i8vec3) Load 192(u8v)
+             324:  222(ivec3) UConvert 323
+             325:  222(ivec3) Load 224(uv)
+             326:  222(ivec3) BitwiseAnd 324 325
+                              Store 224(uv) 326
+             327:  14(int8_t) Load 197(i8)
+             328:     27(int) SConvert 327
+             329:     17(int) Bitcast 328
+             330:  222(ivec3) Load 224(uv)
+             331:  222(ivec3) CompositeConstruct 329 329 329
+             332:  222(ivec3) BitwiseXor 330 331
+                              Store 224(uv) 332
+             333: 190(i8vec3) Load 192(u8v)
+             334:  14(int8_t) Load 197(i8)
+             335:  36(int8_t) Bitcast 334
+             336: 190(i8vec3) CompositeConstruct 335 335 335
+             337: 190(i8vec3) BitwiseXor 333 336
+                              Store 192(u8v) 337
                               Return
                               FunctionEnd
 12(builtinFuncs():           2 Function None 3
               13:             Label
-        341(i8v):     53(ptr) Variable Function
-         344(i8):     15(ptr) Variable Function
-        354(u8v):    191(ptr) Variable Function
-         356(u8):     37(ptr) Variable Function
-        430(i16):    241(ptr) Variable Function
-        433(i32):    215(ptr) Variable Function
-       436(i8v4):    435(ptr) Variable Function
-        440(u16):    439(ptr) Variable Function
-       441(u8v2):     50(ptr) Variable Function
-        444(u32):    293(ptr) Variable Function
-       447(u8v4):    446(ptr) Variable Function
-         459(bv):    458(ptr) Variable Function
-             342:  52(i8vec2) Load 341(i8v)
-             343:  52(i8vec2) ExtInst 1(GLSL.std.450) 5(SAbs) 342
-                              Store 341(i8v) 343
-             345:  14(int8_t) Load 344(i8)
-             346:  14(int8_t) ExtInst 1(GLSL.std.450) 7(SSign) 345
-                              Store 344(i8) 346
-             347:  52(i8vec2) Load 341(i8v)
-             348:  14(int8_t) Load 344(i8)
-             349:  52(i8vec2) CompositeConstruct 348 348
-             350:  52(i8vec2) ExtInst 1(GLSL.std.450) 39(SMin) 347 349
-                              Store 341(i8v) 350
-             351:  52(i8vec2) Load 341(i8v)
-             353:  52(i8vec2) ExtInst 1(GLSL.std.450) 39(SMin) 351 352
-                              Store 341(i8v) 353
-             355: 190(i8vec3) Load 354(u8v)
-             357:  36(int8_t) Load 356(u8)
-             359: 358(i8vec3) CompositeConstruct 357 357 357
-             360: 190(i8vec3) ExtInst 1(GLSL.std.450) 39(SMin) 355 359
-                              Store 354(u8v) 360
-             361: 190(i8vec3) Load 354(u8v)
-             363: 190(i8vec3) ExtInst 1(GLSL.std.450) 39(SMin) 361 362
-                              Store 354(u8v) 363
-             364:  52(i8vec2) Load 341(i8v)
-             365:  14(int8_t) Load 344(i8)
-             366:  52(i8vec2) CompositeConstruct 365 365
-             367:  52(i8vec2) ExtInst 1(GLSL.std.450) 42(SMax) 364 366
-                              Store 341(i8v) 367
-             368:  52(i8vec2) Load 341(i8v)
-             369:  52(i8vec2) ExtInst 1(GLSL.std.450) 42(SMax) 368 352
-                              Store 341(i8v) 369
-             370: 190(i8vec3) Load 354(u8v)
-             371:  36(int8_t) Load 356(u8)
-             372: 358(i8vec3) CompositeConstruct 371 371 371
-             373: 190(i8vec3) ExtInst 1(GLSL.std.450) 42(SMax) 370 372
-                              Store 354(u8v) 373
-             374: 190(i8vec3) Load 354(u8v)
-             375: 190(i8vec3) ExtInst 1(GLSL.std.450) 42(SMax) 374 362
-                              Store 354(u8v) 375
-             376:  52(i8vec2) Load 341(i8v)
-             377:  14(int8_t) Load 344(i8)
-             378:  14(int8_t) SNegate 377
-             379:  14(int8_t) Load 344(i8)
-             380:  52(i8vec2) CompositeConstruct 378 378
-             381:  52(i8vec2) CompositeConstruct 379 379
-             382:  52(i8vec2) ExtInst 1(GLSL.std.450) 45(SClamp) 376 380 381
-                              Store 341(i8v) 382
-             383:  52(i8vec2) Load 341(i8v)
-             384:  52(i8vec2) Load 341(i8v)
-             385:  52(i8vec2) SNegate 384
-             386:  52(i8vec2) Load 341(i8v)
-             387:  52(i8vec2) ExtInst 1(GLSL.std.450) 45(SClamp) 383 385 386
-                              Store 341(i8v) 387
-             388: 190(i8vec3) Load 354(u8v)
-             389:  36(int8_t) Load 356(u8)
-             390:  36(int8_t) SNegate 389
-             391:  36(int8_t) Load 356(u8)
-             392: 358(i8vec3) CompositeConstruct 390 390 390
-             393: 358(i8vec3) CompositeConstruct 391 391 391
-             394: 190(i8vec3) ExtInst 1(GLSL.std.450) 45(SClamp) 388 392 393
-                              Store 354(u8v) 394
-             395: 190(i8vec3) Load 354(u8v)
-             396: 190(i8vec3) Load 354(u8v)
-             397: 190(i8vec3) SNegate 396
-             398: 190(i8vec3) Load 354(u8v)
-             399: 190(i8vec3) ExtInst 1(GLSL.std.450) 45(SClamp) 395 397 398
-                              Store 354(u8v) 399
-             400:     15(ptr) AccessChain 341(i8v) 280
-             401:  14(int8_t) Load 400
-             402:     15(ptr) AccessChain 341(i8v) 264
-             403:  14(int8_t) Load 402
-             405:  14(int8_t) Select 404 403 401
-                              Store 344(i8) 405
-             406:  14(int8_t) Load 344(i8)
-             407:  52(i8vec2) CompositeConstruct 406 406
-             408:  14(int8_t) Load 344(i8)
-             409:  14(int8_t) SNegate 408
-             410:  52(i8vec2) CompositeConstruct 409 409
-             413:  52(i8vec2) Select 412 410 407
-                              Store 341(i8v) 413
-             414:     15(ptr) AccessChain 354(u8v) 280
-             415:  14(int8_t) Load 414
-             416:     15(ptr) AccessChain 354(u8v) 264
-             417:  14(int8_t) Load 416
-             418:  14(int8_t) Select 404 417 415
-             419:  36(int8_t) Bitcast 418
-                              Store 356(u8) 419
-             420:  36(int8_t) Load 356(u8)
-             421:  14(int8_t) Bitcast 420
-             422: 190(i8vec3) CompositeConstruct 421 421 421
-             423:  36(int8_t) Load 356(u8)
-             424:  36(int8_t) SNegate 423
-             425:  14(int8_t) Bitcast 424
-             426: 190(i8vec3) CompositeConstruct 425 425 425
-             429: 190(i8vec3) Select 428 426 422
-                              Store 354(u8v) 429
-             431:  52(i8vec2) Load 341(i8v)
-             432: 57(int16_t) Bitcast 431
-                              Store 430(i16) 432
-             437: 434(i8vec4) Load 436(i8v4)
-             438:     27(int) Bitcast 437
-                              Store 433(i32) 438
-             442:  49(i8vec2) Load 441(u8v2)
-             443: 64(int16_t) Bitcast 442
-                              Store 440(u16) 443
-             448: 445(i8vec4) Load 447(u8v4)
-             449:     17(int) Bitcast 448
-                              Store 444(u32) 449
-             450: 57(int16_t) Load 430(i16)
-             451:  52(i8vec2) Bitcast 450
-                              Store 341(i8v) 451
-             452:     27(int) Load 433(i32)
-             453: 434(i8vec4) Bitcast 452
-                              Store 436(i8v4) 453
-             454: 64(int16_t) Load 440(u16)
-             455:  49(i8vec2) Bitcast 454
-                              Store 441(u8v2) 455
-             456:     17(int) Load 444(u32)
-             457: 445(i8vec4) Bitcast 456
-                              Store 447(u8v4) 457
-             460: 190(i8vec3) Load 354(u8v)
-             461:  36(int8_t) Load 356(u8)
-             462:  14(int8_t) Bitcast 461
-             463: 190(i8vec3) CompositeConstruct 462 462 462
-             464:  427(bvec3) SLessThan 460 463
-                              Store 459(bv) 464
-             465:  52(i8vec2) Load 341(i8v)
-             466:  14(int8_t) Load 344(i8)
-             467:  52(i8vec2) CompositeConstruct 466 466
-             468:  172(bvec2) SLessThan 465 467
-             469:  427(bvec3) Load 459(bv)
-             470:  427(bvec3) VectorShuffle 469 468 3 4 2
-                              Store 459(bv) 470
-             471: 190(i8vec3) Load 354(u8v)
-             472:  36(int8_t) Load 356(u8)
-             473:  14(int8_t) Bitcast 472
-             474: 190(i8vec3) CompositeConstruct 473 473 473
-             475:  427(bvec3) SLessThanEqual 471 474
-                              Store 459(bv) 475
-             476:  52(i8vec2) Load 341(i8v)
-             477:  14(int8_t) Load 344(i8)
-             478:  52(i8vec2) CompositeConstruct 477 477
-             479:  172(bvec2) SLessThanEqual 476 478
-             480:  427(bvec3) Load 459(bv)
-             481:  427(bvec3) VectorShuffle 480 479 3 4 2
-                              Store 459(bv) 481
-             482: 190(i8vec3) Load 354(u8v)
-             483:  36(int8_t) Load 356(u8)
-             484:  14(int8_t) Bitcast 483
+        338(i8v):     53(ptr) Variable Function
+         341(i8):     15(ptr) Variable Function
+        351(u8v):    191(ptr) Variable Function
+         353(u8):     37(ptr) Variable Function
+        423(i16):    239(ptr) Variable Function
+        426(i32):    216(ptr) Variable Function
+       429(i8v4):    428(ptr) Variable Function
+        433(u16):    432(ptr) Variable Function
+       434(u8v2):     50(ptr) Variable Function
+        437(u32):    291(ptr) Variable Function
+       440(u8v4):    439(ptr) Variable Function
+         452(bv):    451(ptr) Variable Function
+             339:  52(i8vec2) Load 338(i8v)
+             340:  52(i8vec2) ExtInst 1(GLSL.std.450) 5(SAbs) 339
+                              Store 338(i8v) 340
+             342:  14(int8_t) Load 341(i8)
+             343:  14(int8_t) ExtInst 1(GLSL.std.450) 7(SSign) 342
+                              Store 341(i8) 343
+             344:  52(i8vec2) Load 338(i8v)
+             345:  14(int8_t) Load 341(i8)
+             346:  52(i8vec2) CompositeConstruct 345 345
+             347:  52(i8vec2) ExtInst 1(GLSL.std.450) 39(SMin) 344 346
+                              Store 338(i8v) 347
+             348:  52(i8vec2) Load 338(i8v)
+             350:  52(i8vec2) ExtInst 1(GLSL.std.450) 39(SMin) 348 349
+                              Store 338(i8v) 350
+             352: 190(i8vec3) Load 351(u8v)
+             354:  36(int8_t) Load 353(u8)
+             355: 190(i8vec3) CompositeConstruct 354 354 354
+             356: 190(i8vec3) ExtInst 1(GLSL.std.450) 38(UMin) 352 355
+                              Store 351(u8v) 356
+             357: 190(i8vec3) Load 351(u8v)
+             359: 190(i8vec3) ExtInst 1(GLSL.std.450) 38(UMin) 357 358
+                              Store 351(u8v) 359
+             360:  52(i8vec2) Load 338(i8v)
+             361:  14(int8_t) Load 341(i8)
+             362:  52(i8vec2) CompositeConstruct 361 361
+             363:  52(i8vec2) ExtInst 1(GLSL.std.450) 42(SMax) 360 362
+                              Store 338(i8v) 363
+             364:  52(i8vec2) Load 338(i8v)
+             365:  52(i8vec2) ExtInst 1(GLSL.std.450) 42(SMax) 364 349
+                              Store 338(i8v) 365
+             366: 190(i8vec3) Load 351(u8v)
+             367:  36(int8_t) Load 353(u8)
+             368: 190(i8vec3) CompositeConstruct 367 367 367
+             369: 190(i8vec3) ExtInst 1(GLSL.std.450) 41(UMax) 366 368
+                              Store 351(u8v) 369
+             370: 190(i8vec3) Load 351(u8v)
+             371: 190(i8vec3) ExtInst 1(GLSL.std.450) 41(UMax) 370 358
+                              Store 351(u8v) 371
+             372:  52(i8vec2) Load 338(i8v)
+             373:  14(int8_t) Load 341(i8)
+             374:  14(int8_t) SNegate 373
+             375:  14(int8_t) Load 341(i8)
+             376:  52(i8vec2) CompositeConstruct 374 374
+             377:  52(i8vec2) CompositeConstruct 375 375
+             378:  52(i8vec2) ExtInst 1(GLSL.std.450) 45(SClamp) 372 376 377
+                              Store 338(i8v) 378
+             379:  52(i8vec2) Load 338(i8v)
+             380:  52(i8vec2) Load 338(i8v)
+             381:  52(i8vec2) SNegate 380
+             382:  52(i8vec2) Load 338(i8v)
+             383:  52(i8vec2) ExtInst 1(GLSL.std.450) 45(SClamp) 379 381 382
+                              Store 338(i8v) 383
+             384: 190(i8vec3) Load 351(u8v)
+             385:  36(int8_t) Load 353(u8)
+             386:  36(int8_t) SNegate 385
+             387:  36(int8_t) Load 353(u8)
+             388: 190(i8vec3) CompositeConstruct 386 386 386
+             389: 190(i8vec3) CompositeConstruct 387 387 387
+             390: 190(i8vec3) ExtInst 1(GLSL.std.450) 44(UClamp) 384 388 389
+                              Store 351(u8v) 390
+             391: 190(i8vec3) Load 351(u8v)
+             392: 190(i8vec3) Load 351(u8v)
+             393: 190(i8vec3) SNegate 392
+             394: 190(i8vec3) Load 351(u8v)
+             395: 190(i8vec3) ExtInst 1(GLSL.std.450) 44(UClamp) 391 393 394
+                              Store 351(u8v) 395
+             396:     15(ptr) AccessChain 338(i8v) 277
+             397:  14(int8_t) Load 396
+             398:     15(ptr) AccessChain 338(i8v) 261
+             399:  14(int8_t) Load 398
+             401:  14(int8_t) Select 400 399 397
+                              Store 341(i8) 401
+             402:  14(int8_t) Load 341(i8)
+             403:  52(i8vec2) CompositeConstruct 402 402
+             404:  14(int8_t) Load 341(i8)
+             405:  14(int8_t) SNegate 404
+             406:  52(i8vec2) CompositeConstruct 405 405
+             409:  52(i8vec2) Select 408 406 403
+                              Store 338(i8v) 409
+             410:     37(ptr) AccessChain 351(u8v) 277
+             411:  36(int8_t) Load 410
+             412:     37(ptr) AccessChain 351(u8v) 261
+             413:  36(int8_t) Load 412
+             414:  36(int8_t) Select 400 413 411
+                              Store 353(u8) 414
+             415:  36(int8_t) Load 353(u8)
+             416: 190(i8vec3) CompositeConstruct 415 415 415
+             417:  36(int8_t) Load 353(u8)
+             418:  36(int8_t) SNegate 417
+             419: 190(i8vec3) CompositeConstruct 418 418 418
+             422: 190(i8vec3) Select 421 419 416
+                              Store 351(u8v) 422
+             424:  52(i8vec2) Load 338(i8v)
+             425: 57(int16_t) Bitcast 424
+                              Store 423(i16) 425
+             430: 427(i8vec4) Load 429(i8v4)
+             431:     27(int) Bitcast 430
+                              Store 426(i32) 431
+             435:  49(i8vec2) Load 434(u8v2)
+             436: 64(int16_t) Bitcast 435
+                              Store 433(u16) 436
+             441: 438(i8vec4) Load 440(u8v4)
+             442:     17(int) Bitcast 441
+                              Store 437(u32) 442
+             443: 57(int16_t) Load 423(i16)
+             444:  52(i8vec2) Bitcast 443
+                              Store 338(i8v) 444
+             445:     27(int) Load 426(i32)
+             446: 427(i8vec4) Bitcast 445
+                              Store 429(i8v4) 446
+             447: 64(int16_t) Load 433(u16)
+             448:  49(i8vec2) Bitcast 447
+                              Store 434(u8v2) 448
+             449:     17(int) Load 437(u32)
+             450: 438(i8vec4) Bitcast 449
+                              Store 440(u8v4) 450
+             453: 190(i8vec3) Load 351(u8v)
+             454:  36(int8_t) Load 353(u8)
+             455: 190(i8vec3) CompositeConstruct 454 454 454
+             456:  420(bvec3) ULessThan 453 455
+                              Store 452(bv) 456
+             457:  52(i8vec2) Load 338(i8v)
+             458:  14(int8_t) Load 341(i8)
+             459:  52(i8vec2) CompositeConstruct 458 458
+             460:  172(bvec2) SLessThan 457 459
+             461:  420(bvec3) Load 452(bv)
+             462:  420(bvec3) VectorShuffle 461 460 3 4 2
+                              Store 452(bv) 462
+             463: 190(i8vec3) Load 351(u8v)
+             464:  36(int8_t) Load 353(u8)
+             465: 190(i8vec3) CompositeConstruct 464 464 464
+             466:  420(bvec3) ULessThanEqual 463 465
+                              Store 452(bv) 466
+             467:  52(i8vec2) Load 338(i8v)
+             468:  14(int8_t) Load 341(i8)
+             469:  52(i8vec2) CompositeConstruct 468 468
+             470:  172(bvec2) SLessThanEqual 467 469
+             471:  420(bvec3) Load 452(bv)
+             472:  420(bvec3) VectorShuffle 471 470 3 4 2
+                              Store 452(bv) 472
+             473: 190(i8vec3) Load 351(u8v)
+             474:  36(int8_t) Load 353(u8)
+             475: 190(i8vec3) CompositeConstruct 474 474 474
+             476:  420(bvec3) UGreaterThan 473 475
+                              Store 452(bv) 476
+             477:  52(i8vec2) Load 338(i8v)
+             478:  14(int8_t) Load 341(i8)
+             479:  52(i8vec2) CompositeConstruct 478 478
+             480:  172(bvec2) SGreaterThan 477 479
+             481:  420(bvec3) Load 452(bv)
+             482:  420(bvec3) VectorShuffle 481 480 3 4 2
+                              Store 452(bv) 482
+             483: 190(i8vec3) Load 351(u8v)
+             484:  36(int8_t) Load 353(u8)
              485: 190(i8vec3) CompositeConstruct 484 484 484
-             486:  427(bvec3) SGreaterThan 482 485
-                              Store 459(bv) 486
-             487:  52(i8vec2) Load 341(i8v)
-             488:  14(int8_t) Load 344(i8)
+             486:  420(bvec3) UGreaterThanEqual 483 485
+                              Store 452(bv) 486
+             487:  52(i8vec2) Load 338(i8v)
+             488:  14(int8_t) Load 341(i8)
              489:  52(i8vec2) CompositeConstruct 488 488
-             490:  172(bvec2) SGreaterThan 487 489
-             491:  427(bvec3) Load 459(bv)
-             492:  427(bvec3) VectorShuffle 491 490 3 4 2
-                              Store 459(bv) 492
-             493: 190(i8vec3) Load 354(u8v)
-             494:  36(int8_t) Load 356(u8)
-             495:  14(int8_t) Bitcast 494
-             496: 190(i8vec3) CompositeConstruct 495 495 495
-             497:  427(bvec3) SGreaterThanEqual 493 496
-                              Store 459(bv) 497
-             498:  52(i8vec2) Load 341(i8v)
-             499:  14(int8_t) Load 344(i8)
-             500:  52(i8vec2) CompositeConstruct 499 499
-             501:  172(bvec2) SGreaterThanEqual 498 500
-             502:  427(bvec3) Load 459(bv)
-             503:  427(bvec3) VectorShuffle 502 501 3 4 2
-                              Store 459(bv) 503
-             504: 190(i8vec3) Load 354(u8v)
-             505:  36(int8_t) Load 356(u8)
-             506:  14(int8_t) Bitcast 505
-             507: 190(i8vec3) CompositeConstruct 506 506 506
-             508:  427(bvec3) IEqual 504 507
-                              Store 459(bv) 508
-             509:  52(i8vec2) Load 341(i8v)
-             510:  14(int8_t) Load 344(i8)
-             511:  52(i8vec2) CompositeConstruct 510 510
-             512:  172(bvec2) IEqual 509 511
-             513:  427(bvec3) Load 459(bv)
-             514:  427(bvec3) VectorShuffle 513 512 3 4 2
-                              Store 459(bv) 514
-             515: 190(i8vec3) Load 354(u8v)
-             516:  36(int8_t) Load 356(u8)
-             517:  14(int8_t) Bitcast 516
-             518: 190(i8vec3) CompositeConstruct 517 517 517
-             519:  427(bvec3) INotEqual 515 518
-                              Store 459(bv) 519
-             520:  52(i8vec2) Load 341(i8v)
-             521:  14(int8_t) Load 344(i8)
-             522:  52(i8vec2) CompositeConstruct 521 521
-             523:  172(bvec2) INotEqual 520 522
-             524:  427(bvec3) Load 459(bv)
-             525:  427(bvec3) VectorShuffle 524 523 3 4 2
-                              Store 459(bv) 525
+             490:  172(bvec2) SGreaterThanEqual 487 489
+             491:  420(bvec3) Load 452(bv)
+             492:  420(bvec3) VectorShuffle 491 490 3 4 2
+                              Store 452(bv) 492
+             493: 190(i8vec3) Load 351(u8v)
+             494:  36(int8_t) Load 353(u8)
+             495: 190(i8vec3) CompositeConstruct 494 494 494
+             496:  420(bvec3) IEqual 493 495
+                              Store 452(bv) 496
+             497:  52(i8vec2) Load 338(i8v)
+             498:  14(int8_t) Load 341(i8)
+             499:  52(i8vec2) CompositeConstruct 498 498
+             500:  172(bvec2) IEqual 497 499
+             501:  420(bvec3) Load 452(bv)
+             502:  420(bvec3) VectorShuffle 501 500 3 4 2
+                              Store 452(bv) 502
+             503: 190(i8vec3) Load 351(u8v)
+             504:  36(int8_t) Load 353(u8)
+             505: 190(i8vec3) CompositeConstruct 504 504 504
+             506:  420(bvec3) INotEqual 503 505
+                              Store 452(bv) 506
+             507:  52(i8vec2) Load 338(i8v)
+             508:  14(int8_t) Load 341(i8)
+             509:  52(i8vec2) CompositeConstruct 508 508
+             510:  172(bvec2) INotEqual 507 509
+             511:  420(bvec3) Load 452(bv)
+             512:  420(bvec3) VectorShuffle 511 510 3 4 2
+                              Store 452(bv) 512
                               Return
                               FunctionEnd

3rdparty/glslang/Test/baseResults/spv.samplerlessTextureFunctions.frag.out

@@ -0,0 +1,93 @@
+spv.samplerlessTextureFunctions.frag
+// Module Version 10000
+// Generated by (magic number): 80007
+// Id's are bound by 51
+
+                              Capability Shader
+                              Capability SampledBuffer
+                              Capability ImageQuery
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main"
+                              ExecutionMode 4 OriginUpperLeft
+                              Source GLSL 450
+                              SourceExtension  "GL_EXT_samplerless_texture_functions"
+                              Name 4  "main"
+                              Name 9  "tex2DFetch"
+                              Name 12  "tex2D"
+                              Name 19  "texMSFetch"
+                              Name 22  "texMS"
+                              Name 25  "bufFetch"
+                              Name 28  "buf"
+                              Name 31  "tex2DFetchOffset"
+                              Name 35  "tex2DSize"
+                              Name 38  "texMSSize"
+                              Name 42  "bufSize"
+                              Name 45  "tex2DLevels"
+                              Name 48  "texMSSamples"
+                              Decorate 12(tex2D) DescriptorSet 0
+                              Decorate 12(tex2D) Binding 1
+                              Decorate 22(texMS) DescriptorSet 0
+                              Decorate 22(texMS) Binding 1
+                              Decorate 28(buf) DescriptorSet 0
+                              Decorate 28(buf) Binding 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeFloat 32
+               7:             TypeVector 6(float) 4
+               8:             TypePointer Function 7(fvec4)
+              10:             TypeImage 6(float) 2D sampled format:Unknown
+              11:             TypePointer UniformConstant 10
+       12(tex2D):     11(ptr) Variable UniformConstant
+              14:             TypeInt 32 1
+              15:             TypeVector 14(int) 2
+              16:     14(int) Constant 0
+              17:   15(ivec2) ConstantComposite 16 16
+              20:             TypeImage 6(float) 2D multi-sampled sampled format:Unknown
+              21:             TypePointer UniformConstant 20
+       22(texMS):     21(ptr) Variable UniformConstant
+              26:             TypeImage 6(float) Buffer sampled format:Unknown
+              27:             TypePointer UniformConstant 26
+         28(buf):     27(ptr) Variable UniformConstant
+              34:             TypePointer Function 15(ivec2)
+              41:             TypePointer Function 14(int)
+         4(main):           2 Function None 3
+               5:             Label
+   9(tex2DFetch):      8(ptr) Variable Function
+  19(texMSFetch):      8(ptr) Variable Function
+    25(bufFetch):      8(ptr) Variable Function
+31(tex2DFetchOffset):      8(ptr) Variable Function
+   35(tex2DSize):     34(ptr) Variable Function
+   38(texMSSize):     34(ptr) Variable Function
+     42(bufSize):     41(ptr) Variable Function
+ 45(tex2DLevels):     41(ptr) Variable Function
+48(texMSSamples):     41(ptr) Variable Function
+              13:          10 Load 12(tex2D)
+              18:    7(fvec4) ImageFetch 13 17 Lod 16
+                              Store 9(tex2DFetch) 18
+              23:          20 Load 22(texMS)
+              24:    7(fvec4) ImageFetch 23 17 Sample 16
+                              Store 19(texMSFetch) 24
+              29:          26 Load 28(buf)
+              30:    7(fvec4) ImageFetch 29 16
+                              Store 25(bufFetch) 30
+              32:          10 Load 12(tex2D)
+              33:    7(fvec4) ImageFetch 32 17 Lod ConstOffset 16 17
+                              Store 31(tex2DFetchOffset) 33
+              36:          10 Load 12(tex2D)
+              37:   15(ivec2) ImageQuerySizeLod 36 16
+                              Store 35(tex2DSize) 37
+              39:          20 Load 22(texMS)
+              40:   15(ivec2) ImageQuerySize 39
+                              Store 38(texMSSize) 40
+              43:          26 Load 28(buf)
+              44:     14(int) ImageQuerySize 43
+                              Store 42(bufSize) 44
+              46:          10 Load 12(tex2D)
+              47:     14(int) ImageQueryLevels 46
+                              Store 45(tex2DLevels) 47
+              49:          20 Load 22(texMS)
+              50:     14(int) ImageQuerySamples 49
+                              Store 48(texMSSamples) 50
+                              Return
+                              FunctionEnd

3rdparty/glslang/Test/baseResults/spv.specConstant.vert.out

@@ -11,7 +11,7 @@ spv.specConstant.vert
                               Source GLSL 400
                               Name 4  "main"
                               Name 9  "arraySize"
-                              Name 14  "foo(vf4[s2468];"
+                              Name 14  "foo(vf4[s2543];"
                               Name 13  "p"
                               Name 17  "builtin_spec_constant("
                               Name 20  "color"
@@ -102,10 +102,10 @@ spv.specConstant.vert
                               Store 20(color) 46
               48:          10 Load 22(ucol)
                               Store 47(param) 48
-              49:           2 FunctionCall 14(foo(vf4[s2468];) 47(param)
+              49:           2 FunctionCall 14(foo(vf4[s2543];) 47(param)
                               Return
                               FunctionEnd
-14(foo(vf4[s2468];):           2 Function None 12
+14(foo(vf4[s2543];):           2 Function None 12
            13(p):     11(ptr) FunctionParameter
               15:             Label
               54:     24(ptr) AccessChain 53(dupUcol) 23

3rdparty/glslang/Test/constFold.frag

@@ -81,7 +81,7 @@ void foo()
     a[0] = s.m[1].z;     // 7.0
     b % 0;  // int
     b / 0;
-    e / 0;
+    e / 0;  -e / 0;  0.0 / 0.0;
     const uint ua = 5;
     const uvec2 ub = uvec2(6, 7);
     const uint uc = 8;

3rdparty/glslang/Test/hlsl.pp.expand.frag

@@ -0,0 +1,17 @@
+#define EMP1(a)
+#define EMP2(a, b)
+
+#define EXP1(a) = a
+#define EXP2(a, b) = a, b
+
+struct A
+{
+    float4 a EMP1({1,2,3,4});                           // No PP arg errors
+    float4 b EMP2({({{(({1,2,3,4}))}})}, {{1,2,3,4}});  // No PP arg errors
+    float4 c EXP1({1,2,3,4});                           // ERROR: No PP arg errors, but init error
+    float4 d EXP2({({{(({1,2,3,4}))}})}, {{1,2,3,4}});  // ERROR: No PP arg errors, but init error
+};
+
+void main()
+{
+}

3rdparty/glslang/Test/preprocessor.bad_arg.vert

@@ -0,0 +1,8 @@
+#define M(a) a
+int M(aou
+    = 2)  // Okay, one argument, split across newline
+    ;
+
+// end of file during an argument
+#define EXP2(a, b)
+EXP2(((((1,2,3,4))), );

3rdparty/glslang/Test/runtests

@@ -215,6 +215,13 @@ $EXE -H -e main -D -Od -fhlsl_functionality1 hlsl.noSemantic.functionality1.comp
     $TARGETDIR/hlsl.noSemantic.functionality1.comp.out
 diff -b $BASEDIR/hlsl.noSemantic.functionality1.comp.out $TARGETDIR/hlsl.noSemantic.functionality1.comp.out || HASERROR=1
 
+#
+# Testing HLSL-specific PP feature expansion
+#
+$EXE -D -E hlsl.pp.expand.frag > $TARGETDIR/hlsl.pp.expand.frag.out 2> $TARGETDIR/hlsl.pp.expand.frag.err
+diff -b $BASEDIR/hlsl.pp.expand.frag.out $TARGETDIR/hlsl.pp.expand.frag.out || HASERROR=1
+diff -b $BASEDIR/hlsl.pp.expand.frag.err $TARGETDIR/hlsl.pp.expand.frag.err || HASERROR=1
+
 #
 # Final checking
 #

3rdparty/glslang/Test/runtimeArray.vert

@@ -0,0 +1,46 @@
+#version 450 core
+
+layout(binding = 1) uniform texture2D tex2D;
+layout(binding = 1) uniform texture2DMS texMS;
+layout(binding = 0) uniform textureBuffer buf;
+
+void testBad()
+{
+    vec4 tex2DFetch = texelFetch(tex2D, ivec2(0, 0), 0);
+    vec4 texMSFetch = texelFetch(texMS, ivec2(0, 0), 0);
+
+    // Allowed by KHR_vulkan_glsl without the extension. All others should
+    // error.
+    vec4 bufFetch = texelFetch(buf, 0);
+
+    vec4 tex2DFetchOffset = texelFetchOffset(tex2D, ivec2(0, 0), 0, ivec2(0, 0));
+
+    ivec2 tex2DSize = textureSize(tex2D, 0);
+    ivec2 texMSSize = textureSize(texMS);
+    int bufSize = textureSize(buf);
+
+    int tex2DLevels = textureQueryLevels(tex2D);
+
+    int texMSSamples = textureSamples(texMS);
+}
+
+#extension GL_EXT_samplerless_texture_functions : enable
+
+void main()
+{
+    // These should all succeed.
+
+    vec4 tex2DFetch = texelFetch(tex2D, ivec2(0, 0), 0);
+    vec4 texMSFetch = texelFetch(texMS, ivec2(0, 0), 0);
+    vec4 bufFetch = texelFetch(buf, 0);
+
+    vec4 tex2DFetchOffset = texelFetchOffset(tex2D, ivec2(0, 0), 0, ivec2(0, 0));
+
+    ivec2 tex2DSize = textureSize(tex2D, 0);
+    ivec2 texMSSize = textureSize(texMS);
+    int bufSize = textureSize(buf);
+
+    int tex2DLevels = textureQueryLevels(tex2D);
+
+    int texMSSamples = textureSamples(texMS);
+}

3rdparty/glslang/Test/spv.16bitstorage-int.frag

@@ -0,0 +1,90 @@
+#version 450 core
+
+#extension GL_EXT_shader_16bit_storage : enable
+
+struct S
+{
+    int16_t  x;
+    i16vec2    y;
+    i16vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    int16_t  a;
+    i16vec2    b;
+    i16vec3    c;
+    int16_t  d[2];
+    S          g;
+    S          h[2];
+    int        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    int16_t  o;
+    i16vec2    p;
+    i16vec3    q;
+    int16_t  r[2];
+    S          u;
+    S          v[2];
+    i16vec2    x[100];
+    int16_t  w[];
+} b2;
+
+layout(row_major, std140) uniform B5
+{
+    int16_t  o;
+    i16vec2    p;
+    i16vec3    q;
+    int16_t  r[2];
+    S          u;
+    S          v[2];
+    i16vec2    x[100];
+    int16_t  w[100];
+} b5;
+
+struct S2 {
+    mat4x4 x;
+    int16_t y;
+    int z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+    S3 y;
+} b4;
+
+void main()
+{
+    b2.o = b1.a;
+    b2.p = i16vec2(ivec3(b2.q).xy);
+    b2.p = i16vec2(ivec3(b5.q).xy);
+    b2.r[0] = b2.r[0];
+    b2.r[1] = b5.r[1];
+    b2.p = b2.p;
+    int x0 = int(b1.a);
+    ivec4 x1 = ivec4(b1.a, b2.p, 1);
+    b4.x.x = b3.x.x;
+    b2.o = int16_t(ivec2(b2.p).x);
+    b2.p = b2.v[1].y;
+    ivec3 v3 = ivec3(b2.w[b1.j], b2.w[b1.j+1], b2.w[b1.j+2]);
+    ivec3 u3 = ivec3(b5.w[b1.j], b5.w[b1.j+1], b5.w[b1.j+2]);
+    b2.x[0] = b2.x[0];
+    b2.x[1] = b5.x[1];
+    b2.p.x = b1.a;
+    b2.o = b2.p.x;
+    b2.p = i16vec2(ivec2(1, 2));
+    b2.o = int16_t(3);
+}
+

3rdparty/glslang/Test/spv.16bitstorage-uint.frag

@@ -0,0 +1,90 @@
+#version 450 core
+
+#extension GL_EXT_shader_16bit_storage : enable
+
+struct S
+{
+    uint16_t  x;
+    u16vec2    y;
+    u16vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    uint16_t  a;
+    u16vec2    b;
+    u16vec3    c;
+    uint16_t  d[2];
+    S          g;
+    S          h[2];
+    uint        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    uint16_t  o;
+    u16vec2    p;
+    u16vec3    q;
+    uint16_t  r[2];
+    S          u;
+    S          v[2];
+    u16vec2    x[100];
+    uint16_t  w[];
+} b2;
+
+layout(row_major, std140) uniform B5
+{
+    uint16_t  o;
+    u16vec2    p;
+    u16vec3    q;
+    uint16_t  r[2];
+    S          u;
+    S          v[2];
+    u16vec2    x[100];
+    uint16_t  w[100];
+} b5;
+
+struct S2 {
+    mat4x4 x;
+    uint16_t y;
+    uint z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+    S3 y;
+} b4;
+
+void main()
+{
+    b2.o = b1.a;
+    b2.p = u16vec2(uvec3(b2.q).xy);
+    b2.p = u16vec2(uvec3(b5.q).xy);
+    b2.r[0] = b2.r[0];
+    b2.r[1] = b5.r[1];
+    b2.p = b2.p;
+    uint x0 = uint(b1.a);
+    uvec4 x1 = uvec4(b1.a, b2.p, 1);
+    b4.x.x = b3.x.x;
+    b2.o = uint16_t(uvec2(b2.p).x);
+    b2.p = b2.v[1].y;
+    uvec3 v3 = uvec3(b2.w[b1.j], b2.w[b1.j+1], b2.w[b1.j+2]);
+    uvec3 u3 = uvec3(b5.w[b1.j], b5.w[b1.j+1], b5.w[b1.j+2]);
+    b2.x[0] = b2.x[0];
+    b2.x[1] = b5.x[1];
+    b2.p.x = b1.a;
+    b2.o = b2.p.x;
+    b2.p = u16vec2(uvec2(1, 2));
+    b2.o = uint16_t(3u);
+}
+

3rdparty/glslang/Test/spv.16bitstorage.frag

@@ -0,0 +1,90 @@
+#version 450 core
+
+#extension GL_EXT_shader_16bit_storage : enable
+
+struct S
+{
+    float16_t  x;
+    f16vec2    y;
+    f16vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    float16_t  a;
+    f16vec2    b;
+    f16vec3    c;
+    float16_t  d[2];
+    S          g;
+    S          h[2];
+    int        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    float16_t  o;
+    f16vec2    p;
+    f16vec3    q;
+    float16_t  r[2];
+    S          u;
+    S          v[2];
+    f16vec2    x[100];
+    float16_t  w[];
+} b2;
+
+layout(row_major, std140) uniform B5
+{
+    float16_t  o;
+    f16vec2    p;
+    f16vec3    q;
+    float16_t  r[2];
+    S          u;
+    S          v[2];
+    f16vec2    x[100];
+    float16_t  w[100];
+} b5;
+
+struct S2 {
+    mat4x4 x;
+    float16_t y;
+    float z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+    S3 y;
+} b4;
+
+void main()
+{
+    b2.o = b1.a;
+    b2.p = f16vec2(vec3(b2.q).xy);
+    b2.p = f16vec2(vec3(b5.q).xy);
+    b2.r[0] = b2.r[0];
+    b2.r[1] = b5.r[1];
+    b2.p = b2.p;
+    float x0 = float(b1.a);
+    vec4 x1 = vec4(b1.a, b2.p, 1.0);
+    b4.x.x = b3.x.x;
+    b2.o = float16_t(vec2(b2.p).x);
+    b2.p = b2.v[1].y;
+    vec3 v3 = vec3(b2.w[b1.j], b2.w[b1.j+1], b2.w[b1.j+2]);
+    vec3 u3 = vec3(b5.w[b1.j], b5.w[b1.j+1], b5.w[b1.j+2]);
+    b2.x[0] = b2.x[0];
+    b2.x[1] = b5.x[1];
+    b2.p.x = b1.a;
+    b2.o = b2.p.x;
+    b2.p = f16vec2(vec2(1.0, 2.0));
+    b2.o = float16_t(3.0);
+}
+

3rdparty/glslang/Test/spv.16bitstorage_Error-int.frag

@@ -0,0 +1,101 @@
+#version 450 core
+
+#extension GL_EXT_shader_16bit_storage : enable
+
+struct S
+{
+    int16_t  x;
+    i16vec2    y;
+    i16vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    int16_t  a;
+    i16vec2    b;
+    i16vec3    c;
+    int16_t  d[2];
+    S          g;
+    S          h[2];
+    int        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    int16_t  o;
+    i16vec2    p;
+    i16vec3    q;
+    int16_t  r[2];
+    S          u;
+    S          v[2];
+    int16_t  w[];
+} b2;
+
+struct S2 {
+    mat4x4 x;
+    int16_t y;
+    int z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+} b4;
+
+void func3(S2 x) {
+}
+
+S2 func4() {
+    return b4.x;
+}
+
+int func(int16_t a) {
+    return 0;
+}
+
+struct S4 {
+    int x;
+    int16_t y;
+};
+
+int func2(int a) { return 0; }
+
+void main()
+{
+    b2.o = b2.q[1];
+    b2.p = b2.q.xy;
+    b2.o = max(b1.a, b1.a);
+    bvec2 bv = lessThan(b2.p, b2.p);
+    b2.o = b1.a + b1.a;
+    b2.o = -b1.a;
+    b2.o = b1.a + 1;
+    b2.p = b2.p.yx;
+    b4.x = b3.x;
+    int16_t f0;
+    S2 f1;
+    S3 f2;
+    if (b1.a == b1.a) {}
+    b2.r = b2.r;
+    b2.p = i16vec2(3, 4);
+    i16vec2[2](i16vec2(ivec2(1,2)), i16vec2(ivec2(3,4)));
+    // NOT ERRORING YET
+    b3.x;
+    S4(0, int16_t(0));
+    func2(b1.a);
+}
+
+
+layout(column_major, std140) uniform B6
+{
+    i16mat2x3  e;
+} b6;
+

3rdparty/glslang/Test/spv.16bitstorage_Error-uint.frag

@@ -0,0 +1,101 @@
+#version 450 core
+
+#extension GL_EXT_shader_16bit_storage : enable
+
+struct S
+{
+    uint16_t  x;
+    u16vec2    y;
+    u16vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    uint16_t  a;
+    u16vec2    b;
+    u16vec3    c;
+    uint16_t  d[2];
+    S          g;
+    S          h[2];
+    uint        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    uint16_t  o;
+    u16vec2    p;
+    u16vec3    q;
+    uint16_t  r[2];
+    S          u;
+    S          v[2];
+    uint16_t  w[];
+} b2;
+
+struct S2 {
+    mat4x4 x;
+    uint16_t y;
+    uint z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+} b4;
+
+void func3(S2 x) {
+}
+
+S2 func4() {
+    return b4.x;
+}
+
+uint func(uint16_t a) {
+    return 0;
+}
+
+struct S4 {
+    uint x;
+    uint16_t y;
+};
+
+uint func2(uint a) { return 0; }
+
+void main()
+{
+    b2.o = b2.q[1];
+    b2.p = b2.q.xy;
+    b2.o = max(b1.a, b1.a);
+    bvec2 bv = lessThan(b2.p, b2.p);
+    b2.o = b1.a + b1.a;
+    b2.o = -b1.a;
+    b2.o = b1.a + 1;
+    b2.p = b2.p.yx;
+    b4.x = b3.x;
+    uint16_t f0;
+    S2 f1;
+    S3 f2;
+    if (b1.a == b1.a) {}
+    b2.r = b2.r;
+    b2.p = u16vec2(3, 4);
+    u16vec2[2](u16vec2(uvec2(1,2)), u16vec2(uvec2(3,4)));
+    // NOT ERRORING YET
+    b3.x;
+    S4(0u, uint16_t(0u));
+    func2(b1.a);
+}
+
+
+layout(column_major, std140) uniform B6
+{
+    u16mat2x3  e;
+} b6;
+

3rdparty/glslang/Test/spv.16bitstorage_Error.frag

@@ -0,0 +1,102 @@
+#version 450 core
+
+#extension GL_EXT_shader_16bit_storage : enable
+
+struct S
+{
+    float16_t  x;
+    f16vec2    y;
+    f16vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    float16_t  a;
+    f16vec2    b;
+    f16vec3    c;
+    float16_t  d[2];
+    S          g;
+    S          h[2];
+    int        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    float16_t  o;
+    f16vec2    p;
+    f16vec3    q;
+    float16_t  r[2];
+    S          u;
+    S          v[2];
+    float16_t  w[];
+} b2;
+
+struct S2 {
+    mat4x4 x;
+    float16_t y;
+    float z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+} b4;
+
+void func3(S2 x) {
+}
+
+S2 func4() {
+    return b4.x;
+}
+
+float func(float16_t a) {
+    return 0.0;
+}
+
+struct S4 {
+    float x;
+    float16_t y;
+};
+
+float func2(float a) { return 0.0; }
+
+void main()
+{
+    b2.o = b2.q[1];
+    b2.p = b2.q.xy;
+    b2.o = max(b1.a, b1.a);
+    bvec2 bv = lessThan(b2.p, b2.p);
+    b2.o = b1.a + b1.a;
+    b2.o = -b1.a;
+    b2.o = b1.a + 1.0;
+    b2.p = b2.p.yx;
+    b4.x = b3.x;
+    float16_t f0;
+    S2 f1;
+    S3 f2;
+    if (b1.a == b1.a) {}
+    b2.r = b2.r;
+    b2.o = 1.0HF;
+    b2.p = f16vec2(3.0, 4.0);
+    f16vec2[2](f16vec2(vec2(1.0,2.0)), f16vec2(vec2(3.0,4.0)));
+    // NOT ERRORING YET
+    b3.x;
+    S4(0.0, float16_t(0.0));
+    func2(b1.a);
+}
+
+
+layout(column_major, std140) uniform B6
+{
+    f16mat2x3  e;
+} b6;
+

3rdparty/glslang/Test/spv.8bitstorage-int.frag

@@ -0,0 +1,90 @@
+#version 450 core
+
+#extension GL_EXT_shader_8bit_storage : enable
+
+struct S
+{
+    int8_t  x;
+    i8vec2    y;
+    i8vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    int8_t  a;
+    i8vec2    b;
+    i8vec3    c;
+    int8_t  d[2];
+    S          g;
+    S          h[2];
+    int        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    int8_t  o;
+    i8vec2    p;
+    i8vec3    q;
+    int8_t  r[2];
+    S          u;
+    S          v[2];
+    i8vec2    x[100];
+    int8_t  w[];
+} b2;
+
+layout(row_major, std140) uniform B5
+{
+    int8_t  o;
+    i8vec2    p;
+    i8vec3    q;
+    int8_t  r[2];
+    S          u;
+    S          v[2];
+    i8vec2    x[100];
+    int8_t  w[100];
+} b5;
+
+struct S2 {
+    mat4x4 x;
+    int8_t y;
+    int z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+    S3 y;
+} b4;
+
+void main()
+{
+    b2.o = b1.a;
+    b2.p = i8vec2(ivec3(b2.q).xy);
+    b2.p = i8vec2(ivec3(b5.q).xy);
+    b2.r[0] = b2.r[0];
+    b2.r[1] = b5.r[1];
+    b2.p = b2.p;
+    int x0 = int(b1.a);
+    ivec4 x1 = ivec4(b1.a, b2.p, 1);
+    b4.x.x = b3.x.x;
+    b2.o = int8_t(ivec2(b2.p).x);
+    b2.p = b2.v[1].y;
+    ivec3 v3 = ivec3(b2.w[b1.j], b2.w[b1.j+1], b2.w[b1.j+2]);
+    ivec3 u3 = ivec3(b5.w[b1.j], b5.w[b1.j+1], b5.w[b1.j+2]);
+    b2.x[0] = b2.x[0];
+    b2.x[1] = b5.x[1];
+    b2.p.x = b1.a;
+    b2.o = b2.p.x;
+    b2.p = i8vec2(ivec2(1, 2));
+    b2.o = int8_t(3);
+}
+

3rdparty/glslang/Test/spv.8bitstorage-uint.frag

@@ -0,0 +1,90 @@
+#version 450 core
+
+#extension GL_EXT_shader_8bit_storage : enable
+
+struct S
+{
+    uint8_t  x;
+    u8vec2    y;
+    u8vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    uint8_t  a;
+    u8vec2    b;
+    u8vec3    c;
+    uint8_t  d[2];
+    S          g;
+    S          h[2];
+    uint        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    uint8_t  o;
+    u8vec2    p;
+    u8vec3    q;
+    uint8_t  r[2];
+    S          u;
+    S          v[2];
+    u8vec2    x[100];
+    uint8_t  w[];
+} b2;
+
+layout(row_major, std140) uniform B5
+{
+    uint8_t  o;
+    u8vec2    p;
+    u8vec3    q;
+    uint8_t  r[2];
+    S          u;
+    S          v[2];
+    u8vec2    x[100];
+    uint8_t  w[100];
+} b5;
+
+struct S2 {
+    mat4x4 x;
+    uint8_t y;
+    uint z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+    S3 y;
+} b4;
+
+void main()
+{
+    b2.o = b1.a;
+    b2.p = u8vec2(uvec3(b2.q).xy);
+    b2.p = u8vec2(uvec3(b5.q).xy);
+    b2.r[0] = b2.r[0];
+    b2.r[1] = b5.r[1];
+    b2.p = b2.p;
+    uint x0 = uint(b1.a);
+    uvec4 x1 = uvec4(b1.a, b2.p, 1);
+    b4.x.x = b3.x.x;
+    b2.o = uint8_t(uvec2(b2.p).x);
+    b2.p = b2.v[1].y;
+    uvec3 v3 = uvec3(b2.w[b1.j], b2.w[b1.j+1], b2.w[b1.j+2]);
+    uvec3 u3 = uvec3(b5.w[b1.j], b5.w[b1.j+1], b5.w[b1.j+2]);
+    b2.x[0] = b2.x[0];
+    b2.x[1] = b5.x[1];
+    b2.p.x = b1.a;
+    b2.o = b2.p.x;
+    b2.p = u8vec2(uvec2(1, 2));
+    b2.o = uint8_t(3u);
+}
+

3rdparty/glslang/Test/spv.8bitstorage_Error-int.frag

@@ -0,0 +1,101 @@
+#version 450 core
+
+#extension GL_EXT_shader_8bit_storage : enable
+
+struct S
+{
+    int8_t  x;
+    i8vec2    y;
+    i8vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    int8_t  a;
+    i8vec2    b;
+    i8vec3    c;
+    int8_t  d[2];
+    S          g;
+    S          h[2];
+    int        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    int8_t  o;
+    i8vec2    p;
+    i8vec3    q;
+    int8_t  r[2];
+    S          u;
+    S          v[2];
+    int8_t  w[];
+} b2;
+
+struct S2 {
+    mat4x4 x;
+    int8_t y;
+    int z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+} b4;
+
+void func3(S2 x) {
+}
+
+S2 func4() {
+    return b4.x;
+}
+
+int func(int8_t a) {
+    return 0;
+}
+
+struct S4 {
+    int x;
+    int8_t y;
+};
+
+int func2(int a) { return 0; }
+
+void main()
+{
+    b2.o = b2.q[1];
+    b2.p = b2.q.xy;
+    b2.o = max(b1.a, b1.a);
+    bvec2 bv = lessThan(b2.p, b2.p);
+    b2.o = b1.a + b1.a;
+    b2.o = -b1.a;
+    b2.o = b1.a + 1;
+    b2.p = b2.p.yx;
+    b4.x = b3.x;
+    int8_t f0;
+    S2 f1;
+    S3 f2;
+    if (b1.a == b1.a) {}
+    b2.r = b2.r;
+    b2.p = i8vec2(3, 4);
+    i8vec2[2](i8vec2(ivec2(1,2)), i8vec2(ivec2(3,4)));
+    // NOT ERRORING YET
+    b3.x;
+    S4(0, int8_t(0));
+    func2(b1.a);
+}
+
+
+layout(column_major, std140) uniform B6
+{
+    i8mat2x3  e;
+} b6;
+

3rdparty/glslang/Test/spv.8bitstorage_Error-uint.frag

@@ -0,0 +1,101 @@
+#version 450 core
+
+#extension GL_EXT_shader_8bit_storage : enable
+
+struct S
+{
+    uint8_t  x;
+    u8vec2    y;
+    u8vec3    z;
+};
+
+layout(column_major, std140) uniform B1
+{
+    uint8_t  a;
+    u8vec2    b;
+    u8vec3    c;
+    uint8_t  d[2];
+    S          g;
+    S          h[2];
+    uint        j;
+} b1;
+
+layout(row_major, std430) buffer B2
+{
+    uint8_t  o;
+    u8vec2    p;
+    u8vec3    q;
+    uint8_t  r[2];
+    S          u;
+    S          v[2];
+    uint8_t  w[];
+} b2;
+
+struct S2 {
+    mat4x4 x;
+    uint8_t y;
+    uint z;
+};
+
+struct S3 {
+    S2 x;
+};
+
+layout(row_major, std430) buffer B3
+{
+    S2 x;
+} b3;
+
+layout(column_major, std430) buffer B4
+{
+    S2 x;
+} b4;
+
+void func3(S2 x) {
+}
+
+S2 func4() {
+    return b4.x;
+}
+
+uint func(uint8_t a) {
+    return 0;
+}
+
+struct S4 {
+    uint x;
+    uint8_t y;
+};
+
+uint func2(uint a) { return 0; }
+
+void main()
+{
+    b2.o = b2.q[1];
+    b2.p = b2.q.xy;
+    b2.o = max(b1.a, b1.a);
+    bvec2 bv = lessThan(b2.p, b2.p);
+    b2.o = b1.a + b1.a;
+    b2.o = -b1.a;
+    b2.o = b1.a + 1;
+    b2.p = b2.p.yx;
+    b4.x = b3.x;
+    uint8_t f0;
+    S2 f1;
+    S3 f2;
+    if (b1.a == b1.a) {}
+    b2.r = b2.r;
+    b2.p = u8vec2(3, 4);
+    u8vec2[2](u8vec2(uvec2(1,2)), u8vec2(uvec2(3,4)));
+    // NOT ERRORING YET
+    b3.x;
+    S4(0u, uint8_t(0u));
+    func2(b1.a);
+}
+
+
+layout(column_major, std140) uniform B6
+{
+    u8mat2x3  e;
+} b6;
+

3rdparty/glslang/Test/spv.samplerlessTextureFunctions.frag

@@ -0,0 +1,23 @@
+#version 450 core
+#extension GL_EXT_samplerless_texture_functions : enable
+
+layout(binding = 1) uniform texture2D tex2D;
+layout(binding = 1) uniform texture2DMS texMS;
+layout(binding = 0) uniform textureBuffer buf;
+
+void main()
+{
+    vec4 tex2DFetch = texelFetch(tex2D, ivec2(0, 0), 0);
+    vec4 texMSFetch = texelFetch(texMS, ivec2(0, 0), 0);
+    vec4 bufFetch = texelFetch(buf, 0);
+
+    vec4 tex2DFetchOffset = texelFetchOffset(tex2D, ivec2(0, 0), 0, ivec2(0, 0));
+
+    ivec2 tex2DSize = textureSize(tex2D, 0);
+    ivec2 texMSSize = textureSize(texMS);
+    int bufSize = textureSize(buf);
+
+    int tex2DLevels = textureQueryLevels(tex2D);
+
+    int texMSSamples = textureSamples(texMS);
+}

3rdparty/glslang/glslang/Include/Types.h

@@ -1472,6 +1472,16 @@ public:
         return contains([](const TType* t) { return t->isArray() && t->arraySizes->isOuterSpecialization(); } );
     }
 
+    virtual bool contains16BitInt() const
+    {
+        return containsBasicType(EbtInt16) || containsBasicType(EbtUint16);
+    }
+
+    virtual bool contains8BitInt() const
+    {
+        return containsBasicType(EbtInt8) || containsBasicType(EbtUint8);
+    }
+
     // Array editing methods.  Array descriptors can be shared across
     // type instances.  This allows all uses of the same array
     // to be updated at once.  E.g., all nodes can be explicitly sized

3rdparty/glslang/glslang/Include/revision.h

@@ -1,3 +1,3 @@
 // This header is generated by the make-revision script.
 
-#define GLSLANG_PATCH_LEVEL 2776
+#define GLSLANG_PATCH_LEVEL 2797

3rdparty/glslang/glslang/MachineIndependent/Constant.cpp

@@ -179,7 +179,14 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TIntermTyped* right
             case EbtDouble:
             case EbtFloat:
             case EbtFloat16:
-                newConstArray[i].setDConst(leftUnionArray[i].getDConst() / rightUnionArray[i].getDConst());
+                if (rightUnionArray[i].getDConst() != 0.0)
+                    newConstArray[i].setDConst(leftUnionArray[i].getDConst() / rightUnionArray[i].getDConst());
+                else if (leftUnionArray[i].getDConst() > 0.0)
+                    newConstArray[i].setDConst((double)INFINITY);
+                else if (leftUnionArray[i].getDConst() < 0.0)
+                    newConstArray[i].setDConst((double)-INFINITY);
+                else
+                    newConstArray[i].setDConst((double)NAN);
                 break;
             case EbtInt8:
                 if (rightUnionArray[i] == (signed char)0)

3rdparty/glslang/glslang/MachineIndependent/Initialize.cpp

@@ -5914,15 +5914,19 @@ void TBuiltIns::add2ndGenerationSamplingImaging(int version, EProfile profile, c
                                 addSamplingFunctions(sampler, typeName, version, profile);
                                 addGatherFunctions(sampler, typeName, version, profile);
 
-                                if (spvVersion.vulkan > 0 && sampler.dim == EsdBuffer && sampler.isCombined()) {
-                                    // Vulkan wants a textureBuffer to allow texelFetch() --
-                                    // a sampled image with no sampler.
-                                    // So, add sampling functions for both the
-                                    // samplerBuffer and textureBuffer types.
+                                if (spvVersion.vulkan > 0 && sampler.isCombined() && !sampler.shadow) {
+                                    // Base Vulkan allows texelFetch() for
+                                    // textureBuffer (i.e. without sampler).
+                                    //
+                                    // GL_EXT_samplerless_texture_functions
+                                    // allows texelFetch() and query functions
+                                    // (other than textureQueryLod()) for all
+                                    // texture types.
                                     sampler.setTexture(sampler.type, sampler.dim, sampler.arrayed, sampler.shadow,
                                                        sampler.ms);
                                     TString textureTypeName = sampler.getString();
                                     addSamplingFunctions(sampler, textureTypeName, version, profile);
+                                    addQueryFunctions(sampler, textureTypeName, version, profile);
                                 }
                             }
                         }
@@ -5995,7 +5999,7 @@ void TBuiltIns::addQueryFunctions(TSampler sampler, const TString& typeName, int
     // textureQueryLod(), fragment stage only
     //
 
-    if (profile != EEsProfile && version >= 400 && ! sampler.image && sampler.dim != EsdRect && ! sampler.ms && sampler.dim != EsdBuffer) {
+    if (profile != EEsProfile && version >= 400 && sampler.combined && sampler.dim != EsdRect && ! sampler.ms && sampler.dim != EsdBuffer) {
 #ifdef AMD_EXTENSIONS
         for (int f16TexAddr = 0; f16TexAddr < 2; ++f16TexAddr) {
             if (f16TexAddr && sampler.type != EbtFloat16)
@@ -6200,12 +6204,12 @@ void TBuiltIns::addSamplingFunctions(TSampler sampler, const TString& typeName,
     //
     for (int proj = 0; proj <= 1; ++proj) { // loop over "bool" projective or not
 
-        if (proj && (sampler.dim == EsdCube || sampler.dim == EsdBuffer || sampler.arrayed || sampler.ms))
+        if (proj && (sampler.dim == EsdCube || sampler.dim == EsdBuffer || sampler.arrayed || sampler.ms || !sampler.combined))
             continue;
 
         for (int lod = 0; lod <= 1; ++lod) {
 
-            if (lod && (sampler.dim == EsdBuffer || sampler.dim == EsdRect || sampler.ms))
+            if (lod && (sampler.dim == EsdBuffer || sampler.dim == EsdRect || sampler.ms || !sampler.combined))
                 continue;
             if (lod && sampler.dim == Esd2D && sampler.arrayed && sampler.shadow)
                 continue;
@@ -6214,7 +6218,7 @@ void TBuiltIns::addSamplingFunctions(TSampler sampler, const TString& typeName,
 
             for (int bias = 0; bias <= 1; ++bias) {
 
-                if (bias && (lod || sampler.ms))
+                if (bias && (lod || sampler.ms || !sampler.combined))
                     continue;
                 if (bias && (sampler.dim == Esd2D || sampler.dim == EsdCube) && sampler.shadow && sampler.arrayed)
                     continue;
@@ -6236,12 +6240,12 @@ void TBuiltIns::addSamplingFunctions(TSampler sampler, const TString& typeName,
                             continue;
                         if (fetch && (sampler.shadow || sampler.dim == EsdCube))
                             continue;
-                        if (fetch == 0 && (sampler.ms || sampler.dim == EsdBuffer))
+                        if (fetch == 0 && (sampler.ms || sampler.dim == EsdBuffer || !sampler.combined))
                             continue;
 
                         for (int grad = 0; grad <= 1; ++grad) { // loop over "bool" grad or not
 
-                            if (grad && (lod || bias || sampler.ms))
+                            if (grad && (lod || bias || sampler.ms || !sampler.combined))
                                 continue;
                             if (grad && sampler.dim == EsdBuffer)
                                 continue;
@@ -6263,7 +6267,7 @@ void TBuiltIns::addSamplingFunctions(TSampler sampler, const TString& typeName,
 
                                 if (extraProj && ! proj)
                                     continue;
-                                if (extraProj && (sampler.dim == Esd3D || sampler.shadow))
+                                if (extraProj && (sampler.dim == Esd3D || sampler.shadow || !sampler.combined))
                                     continue;
 #ifdef AMD_EXTENSIONS
                                 for (int f16TexAddr = 0; f16TexAddr <= 1; ++f16TexAddr) { // loop over 16-bit floating-point texel addressing

3rdparty/glslang/glslang/MachineIndependent/Intermediate.cpp

@@ -881,6 +881,9 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
     // like vector and matrix sizes.
 
     TBasicType promoteTo;
+    // GL_EXT_shader_16bit_storage can't do OpConstantComposite with
+    // 16-bit types, so disable promotion for those types.
+    bool canPromoteConstant = true;
 
     switch (op) {
     //
@@ -897,18 +900,28 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
         break;
     case EOpConstructFloat16:
         promoteTo = EbtFloat16;
+        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_float16);
         break;
     case EOpConstructInt8:
         promoteTo = EbtInt8;
+        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int8);
         break;
     case EOpConstructUint8:
         promoteTo = EbtUint8;
+        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int8);
         break;
     case EOpConstructInt16:
         promoteTo = EbtInt16;
+        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int16);
         break;
     case EOpConstructUint16:
         promoteTo = EbtUint16;
+        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int16);
         break;
     case EOpConstructInt:
         promoteTo = EbtInt;
@@ -999,7 +1012,7 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
             return nullptr;
     }
 
-    if (node->getAsConstantUnion())
+    if (canPromoteConstant && node->getAsConstantUnion())
         return promoteConstantUnion(promoteTo, node->getAsConstantUnion());
 
     //
@@ -1468,16 +1481,16 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             case EbtUint:
             case EbtInt64:
             case EbtUint64:
+            case EbtFloat:
+            case EbtDouble:
+                return true;
 #ifdef AMD_EXTENSIONS
             case EbtInt16:
             case EbtUint16:
+                return extensionRequested(E_GL_AMD_gpu_shader_int16);
+            case EbtFloat16:
+                return extensionRequested(E_GL_AMD_gpu_shader_half_float);
 #endif
-             case EbtFloat:
-             case EbtDouble:
-#ifdef AMD_EXTENSIONS
-             case EbtFloat16:
-#endif
-                return true;
             default:
                 return false;
            }
@@ -1485,17 +1498,21 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             switch (from) {
             case EbtInt:
             case EbtUint:
+            case EbtFloat:
+                 return true;
+            case EbtBool:
+                 return (source == EShSourceHlsl);
 #ifdef AMD_EXTENSIONS
             case EbtInt16:
             case EbtUint16:
+                return extensionRequested(E_GL_AMD_gpu_shader_int16);
 #endif
-            case EbtFloat:
-#ifdef AMD_EXTENSIONS
             case EbtFloat16:
+                return 
+#ifdef AMD_EXTENSIONS
+                    extensionRequested(E_GL_AMD_gpu_shader_half_float) ||
 #endif
-                 return true;
-            case EbtBool:
-                 return (source == EShSourceHlsl);
+                    (source == EShSourceHlsl);
             default:
                  return false;
             }
@@ -1504,25 +1521,27 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             case EbtInt:
                  return version >= 400 || (source == EShSourceHlsl);
             case EbtUint:
+                return true;
+            case EbtBool:
+                return (source == EShSourceHlsl);
 #ifdef AMD_EXTENSIONS
             case EbtInt16:
             case EbtUint16:
+                return extensionRequested(E_GL_AMD_gpu_shader_int16);
 #endif
-                return true;
-            case EbtBool:
-                return (source == EShSourceHlsl);
             default:
                 return false;
             }
         case EbtInt:
             switch (from) {
             case EbtInt:
-#ifdef AMD_EXTENSIONS
-            case EbtInt16:
-#endif
                 return true;
             case EbtBool:
                 return (source == EShSourceHlsl);
+#ifdef AMD_EXTENSIONS
+            case EbtInt16:
+                return extensionRequested(E_GL_AMD_gpu_shader_int16);
+#endif
             default:
                 return false;
             }
@@ -1532,11 +1551,12 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             case EbtUint:
             case EbtInt64:
             case EbtUint64:
+                return true;
 #ifdef AMD_EXTENSIONS
             case EbtInt16:
             case EbtUint16:
+                return extensionRequested(E_GL_AMD_gpu_shader_int16);
 #endif
-                return true;
             default:
                 return false;
             }
@@ -1544,32 +1564,36 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             switch (from) {
             case EbtInt:
             case EbtInt64:
+                return true;
 #ifdef AMD_EXTENSIONS
             case EbtInt16:
+                return extensionRequested(E_GL_AMD_gpu_shader_int16);
 #endif
-                return true;
             default:
                 return false;
             }
-#ifdef AMD_EXTENSIONS
         case EbtFloat16:
             switch (from) {
+#ifdef AMD_EXTENSIONS
             case EbtInt16:
             case EbtUint16:
+                return extensionRequested(E_GL_AMD_gpu_shader_int16);
             case EbtFloat16:
-                return true;
+                return extensionRequested(E_GL_AMD_gpu_shader_half_float);
+#endif
             default:
                 return false;
         }
         case EbtUint16:
             switch (from) {
+#ifdef AMD_EXTENSIONS
             case EbtInt16:
             case EbtUint16:
-                return true;
+                return extensionRequested(E_GL_AMD_gpu_shader_int16);
+#endif
             default:
                 return false;
         }
-#endif
         default:
             return false;
         }

3rdparty/glslang/glslang/MachineIndependent/ParseHelper.cpp

@@ -354,95 +354,108 @@ TIntermTyped* TParseContext::handleVariable(const TSourceLoc& loc, TSymbol* symb
 //
 TIntermTyped* TParseContext::handleBracketDereference(const TSourceLoc& loc, TIntermTyped* base, TIntermTyped* index)
 {
-    TIntermTyped* result = nullptr;
-
     int indexValue = 0;
     if (index->getQualifier().isFrontEndConstant())
         indexValue = index->getAsConstantUnion()->getConstArray()[0].getIConst();
 
+    // basic type checks...
     variableCheck(base);
+
     if (! base->isArray() && ! base->isMatrix() && ! base->isVector()) {
         if (base->getAsSymbolNode())
             error(loc, " left of '[' is not of type array, matrix, or vector ", base->getAsSymbolNode()->getName().c_str(), "");
         else
             error(loc, " left of '[' is not of type array, matrix, or vector ", "expression", "");
-    } else if (base->getType().getQualifier().isFrontEndConstant() && index->getQualifier().isFrontEndConstant()) {
+
+        // Insert dummy error-recovery result
+        return intermediate.addConstantUnion(0.0, EbtFloat, loc);
+    }
+
+    if (!base->isArray() && base->isVector()) {
+        if (base->getType().containsBasicType(EbtFloat16)) {
+            requireFloat16Arithmetic(loc, "'[' does not operate on types containing float16");
+        }
+        if (base->getType().contains16BitInt()) {
+            requireInt16Arithmetic(loc, "'[' does not operate on types containing (u)int16");
+        }
+        if (base->getType().contains8BitInt()) {
+            requireInt8Arithmetic(loc, "'[' does not operate on types containing (u)int8");
+        }
+    }
+
+    // check for constant folding
+    if (base->getType().getQualifier().isFrontEndConstant() && index->getQualifier().isFrontEndConstant()) {
         // both base and index are front-end constants
         checkIndex(loc, base->getType(), indexValue);
         return intermediate.foldDereference(base, indexValue, loc);
-    } else {
-        // at least one of base and index is not a front-end constant variable...
+    }
 
-        if (index->getQualifier().isFrontEndConstant())
-            checkIndex(loc, base->getType(), indexValue);
+    // at least one of base and index is not a front-end constant variable...
+    TIntermTyped* result = nullptr;
+    if (index->getQualifier().isFrontEndConstant())
+        checkIndex(loc, base->getType(), indexValue);
 
-        if (base->getAsSymbolNode() && isIoResizeArray(base->getType()))
-            handleIoResizeArrayAccess(loc, base);
+    if (base->getAsSymbolNode() && isIoResizeArray(base->getType()))
+        handleIoResizeArrayAccess(loc, base);
 
-        if (index->getQualifier().isFrontEndConstant()) {
-            if (base->getType().isUnsizedArray())
-                base->getWritableType().updateImplicitArraySize(indexValue + 1);
-            else
-                checkIndex(loc, base->getType(), indexValue);
-            result = intermediate.addIndex(EOpIndexDirect, base, index, loc);
-        } else {
-            if (base->getType().isUnsizedArray()) {
-                // we have a variable index into an unsized array, which is okay,
-                // depending on the situation
-                if (base->getAsSymbolNode() && isIoResizeArray(base->getType()))
-                    error(loc, "", "[", "array must be sized by a redeclaration or layout qualifier before being indexed with a variable");
-                else {
-                    // it is okay for a run-time sized array
-                    checkRuntimeSizable(loc, *base);
-                }
-                base->getWritableType().setArrayVariablyIndexed();
+    if (index->getQualifier().isFrontEndConstant()) {
+        if (base->getType().isUnsizedArray())
+            base->getWritableType().updateImplicitArraySize(indexValue + 1);
+        else
+            checkIndex(loc, base->getType(), indexValue);
+        result = intermediate.addIndex(EOpIndexDirect, base, index, loc);
+    } else {
+        if (base->getType().isUnsizedArray()) {
+            // we have a variable index into an unsized array, which is okay,
+            // depending on the situation
+            if (base->getAsSymbolNode() && isIoResizeArray(base->getType()))
+                error(loc, "", "[", "array must be sized by a redeclaration or layout qualifier before being indexed with a variable");
+            else {
+                // it is okay for a run-time sized array
+                checkRuntimeSizable(loc, *base);
             }
-            if (base->getBasicType() == EbtBlock) {
-                if (base->getQualifier().storage == EvqBuffer)
-                    requireProfile(base->getLoc(), ~EEsProfile, "variable indexing buffer block array");
-                else if (base->getQualifier().storage == EvqUniform)
-                    profileRequires(base->getLoc(), EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5,
-                                    "variable indexing uniform block array");
-                else {
-                    // input/output blocks either don't exist or can be variable indexed
-                }
-            } else if (language == EShLangFragment && base->getQualifier().isPipeOutput())
-                requireProfile(base->getLoc(), ~EEsProfile, "variable indexing fragment shader output array");
-            else if (base->getBasicType() == EbtSampler && version >= 130) {
-                const char* explanation = "variable indexing sampler array";
-                requireProfile(base->getLoc(), EEsProfile | ECoreProfile | ECompatibilityProfile, explanation);
-                profileRequires(base->getLoc(), EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5, explanation);
-                profileRequires(base->getLoc(), ECoreProfile | ECompatibilityProfile, 400, nullptr, explanation);
+            base->getWritableType().setArrayVariablyIndexed();
+        }
+        if (base->getBasicType() == EbtBlock) {
+            if (base->getQualifier().storage == EvqBuffer)
+                requireProfile(base->getLoc(), ~EEsProfile, "variable indexing buffer block array");
+            else if (base->getQualifier().storage == EvqUniform)
+                profileRequires(base->getLoc(), EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5,
+                                "variable indexing uniform block array");
+            else {
+                // input/output blocks either don't exist or can be variable indexed
             }
-
-            result = intermediate.addIndex(EOpIndexIndirect, base, index, loc);
+        } else if (language == EShLangFragment && base->getQualifier().isPipeOutput())
+            requireProfile(base->getLoc(), ~EEsProfile, "variable indexing fragment shader output array");
+        else if (base->getBasicType() == EbtSampler && version >= 130) {
+            const char* explanation = "variable indexing sampler array";
+            requireProfile(base->getLoc(), EEsProfile | ECoreProfile | ECompatibilityProfile, explanation);
+            profileRequires(base->getLoc(), EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5, explanation);
+            profileRequires(base->getLoc(), ECoreProfile | ECompatibilityProfile, 400, nullptr, explanation);
         }
+
+        result = intermediate.addIndex(EOpIndexIndirect, base, index, loc);
     }
 
-    if (result == nullptr) {
-        // Insert dummy error-recovery result
-        result = intermediate.addConstantUnion(0.0, EbtFloat, loc);
-    } else {
-        // Insert valid dereferenced result
-        TType newType(base->getType(), 0);  // dereferenced type
-        if (base->getType().getQualifier().isConstant() && index->getQualifier().isConstant()) {
-            newType.getQualifier().storage = EvqConst;
-            // If base or index is a specialization constant, the result should also be a specialization constant.
-            if (base->getType().getQualifier().isSpecConstant() || index->getQualifier().isSpecConstant()) {
-                newType.getQualifier().makeSpecConstant();
-            }
-        } else {
-            newType.getQualifier().makePartialTemporary();
+    // Insert valid dereferenced result
+    TType newType(base->getType(), 0);  // dereferenced type
+    if (base->getType().getQualifier().isConstant() && index->getQualifier().isConstant()) {
+        newType.getQualifier().storage = EvqConst;
+        // If base or index is a specialization constant, the result should also be a specialization constant.
+        if (base->getType().getQualifier().isSpecConstant() || index->getQualifier().isSpecConstant()) {
+            newType.getQualifier().makeSpecConstant();
         }
-        result->setType(newType);
+    } else {
+        newType.getQualifier().makePartialTemporary();
+    }
+    result->setType(newType);
 
-        // Propagate nonuniform
-        if (base->getQualifier().isNonUniform() || index->getQualifier().isNonUniform())
-            result->getWritableType().getQualifier().nonUniform = true;
+    // Propagate nonuniform
+    if (base->getQualifier().isNonUniform() || index->getQualifier().isNonUniform())
+        result->getWritableType().getQualifier().nonUniform = true;
 
-        if (anyIndexLimits)
-            handleIndexLimits(loc, base, index);
-    }
+    if (anyIndexLimits)
+        handleIndexLimits(loc, base, index);
 
     return result;
 }
@@ -615,6 +628,12 @@ TIntermTyped* TParseContext::handleBinaryMath(const TSourceLoc& loc, const char*
         break;
     }
 
+    if (((left->getType().containsBasicType(EbtFloat16) || right->getType().containsBasicType(EbtFloat16)) && !float16Arithmetic()) ||
+        ((left->getType().contains16BitInt() || right->getType().contains16BitInt()) && !int16Arithmetic()) ||
+        ((left->getType().contains8BitInt() || right->getType().contains8BitInt()) && !int8Arithmetic())) {
+        allowed = false;
+    }
+
     TIntermTyped* result = nullptr;
     if (allowed)
         result = intermediate.addBinaryMath(op, left, right, loc);
@@ -630,7 +649,17 @@ TIntermTyped* TParseContext::handleUnaryMath(const TSourceLoc& loc, const char*
 {
     rValueErrorCheck(loc, str, childNode);
 
-    TIntermTyped* result = intermediate.addUnaryMath(op, childNode, loc);
+    bool allowed = true;
+    if ((childNode->getType().containsBasicType(EbtFloat16) && !float16Arithmetic()) ||
+        (childNode->getType().contains16BitInt() && !int16Arithmetic()) ||
+        (childNode->getType().contains8BitInt() && !int8Arithmetic())) {
+        allowed = false;
+    }
+
+    TIntermTyped* result = nullptr;
+    
+    if (allowed)
+        result = intermediate.addUnaryMath(op, childNode, loc);
 
     if (result)
         return result;
@@ -692,6 +721,16 @@ TIntermTyped* TParseContext::handleDotDereference(const TSourceLoc& loc, TInterm
         TSwizzleSelectors<TVectorSelector> selectors;
         parseSwizzleSelector(loc, field, base->getVectorSize(), selectors);
 
+        if (base->isVector() && selectors.size() != 1 && base->getType().containsBasicType(EbtFloat16)) {
+            requireFloat16Arithmetic(loc, "can't swizzle types containing float16");
+        }
+        if (base->isVector() && selectors.size() != 1 && base->getType().contains16BitInt()) {
+            requireInt16Arithmetic(loc, "can't swizzle types containing (u)int16");
+        }
+        if (base->isVector() && selectors.size() != 1 && base->getType().contains8BitInt()) {
+            requireInt8Arithmetic(loc, "can't swizzle types containing (u)int8");
+        }
+
         if (base->isScalar()) {
             if (selectors.size() == 1)
                 return result;
@@ -970,6 +1009,16 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
             if (builtIn && fnCandidate->getNumExtensions())
                 requireExtensions(loc, fnCandidate->getNumExtensions(), fnCandidate->getExtensions(), fnCandidate->getName().c_str());
 
+            if (builtIn && fnCandidate->getType().containsBasicType(EbtFloat16)) {
+                requireFloat16Arithmetic(loc, "float16 types can only be in uniform block or buffer storage");
+            }
+            if (builtIn && fnCandidate->getType().contains16BitInt()) {
+                requireInt16Arithmetic(loc, "(u)int16 types can only be in uniform block or buffer storage");
+            }
+            if (builtIn && fnCandidate->getType().contains8BitInt()) {
+                requireInt8Arithmetic(loc, "(u)int8 types can only be in uniform block or buffer storage");
+            }
+
             if (arguments != nullptr) {
                 // Make sure qualifications work for these arguments.
                 TIntermAggregate* aggregate = arguments->getAsAggregate();
@@ -995,6 +1044,17 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
                         if (argQualifier.writeonly && ! formalQualifier.writeonly)
                             error(arguments->getLoc(), message, "writeonly", "");
                     }
+
+                    if (builtIn && arg->getAsTyped()->getType().containsBasicType(EbtFloat16)) {
+                        requireFloat16Arithmetic(arguments->getLoc(), "float16 types can only be in uniform block or buffer storage");
+                    }
+                    if (builtIn && arg->getAsTyped()->getType().contains16BitInt()) {
+                        requireInt16Arithmetic(arguments->getLoc(), "(u)int16 types can only be in uniform block or buffer storage");
+                    }
+                    if (builtIn && arg->getAsTyped()->getType().contains8BitInt()) {
+                        requireInt8Arithmetic(arguments->getLoc(), "(u)int8 types can only be in uniform block or buffer storage");
+                    }
+
                     // TODO 4.5 functionality:  A shader will fail to compile
                     // if the value passed to the memargument of an atomic memory function does not correspond to a buffer or
                     // shared variable. It is acceptable to pass an element of an array or a single component of a vector to the
@@ -1179,6 +1239,8 @@ void TParseContext::computeBuiltinPrecisions(TIntermTyped& node, const TFunction
 
 TIntermNode* TParseContext::handleReturnValue(const TSourceLoc& loc, TIntermTyped* value)
 {
+    storage16BitAssignmentCheck(loc, value->getType(), "return");
+
     functionReturnsValue = true;
     if (currentFunctionType->getBasicType() == EbtVoid) {
         error(loc, "void function cannot return a value", "return", "");
@@ -1705,6 +1767,31 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
         break;
     }
 
+    // Texture operations on texture objects (aside from texelFetch on a
+    // textureBuffer) require EXT_samplerless_texture_functions.
+    switch (callNode.getOp()) {
+    case EOpTextureQuerySize:
+    case EOpTextureQueryLevels:
+    case EOpTextureQuerySamples:
+    case EOpTextureFetch:
+    case EOpTextureFetchOffset:
+    {
+        const TSampler& sampler = fnCandidate[0].type->getSampler();
+
+        const bool isTexture = sampler.isTexture() && !sampler.isCombined();
+        const bool isBuffer = sampler.dim == EsdBuffer;
+        const bool isFetch = callNode.getOp() == EOpTextureFetch || callNode.getOp() == EOpTextureFetchOffset;
+
+        if (isTexture && (!isBuffer || !isFetch))
+            requireExtensions(loc, 1, &E_GL_EXT_samplerless_texture_functions, fnCandidate.getName().c_str());
+
+        break;
+    }
+
+    default:
+        break;
+    }
+
     if (callNode.getOp() > EOpSubgroupGuardStart && callNode.getOp() < EOpSubgroupGuardStop) {
         // these require SPIR-V 1.3
         if (spvVersion.spv > 0 && spvVersion.spv < EShTargetSpv_1_3)
@@ -2328,6 +2415,68 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
             specConstType = true;
         if (function[arg].type->isFloatingDomain())
             floatArgument = true;
+        if (type.isStruct()) {
+            if (function[arg].type->containsBasicType(EbtFloat16)) {
+                requireFloat16Arithmetic(loc, "Can't construct structure containing 16-bit type");
+            }
+            if (function[arg].type->containsBasicType(EbtUint16) ||
+                function[arg].type->containsBasicType(EbtInt16)) {
+                requireInt16Arithmetic(loc, "Can't construct structure containing 16-bit type");
+            }
+            if (function[arg].type->containsBasicType(EbtUint8) ||
+                function[arg].type->containsBasicType(EbtInt8)) {
+                requireInt8Arithmetic(loc, "Can't construct structure containing 8-bit type");
+            }
+        }
+    }
+
+    switch (op) {
+    case EOpConstructFloat16:
+    case EOpConstructF16Vec2:
+    case EOpConstructF16Vec3:
+    case EOpConstructF16Vec4:
+        if (type.isArray()) {
+            requireFloat16Arithmetic(loc, "16-bit array constructors not supported");
+        }
+
+        if (type.isVector() && function.getParamCount() != 1) {
+            requireFloat16Arithmetic(loc, "16-bit vector constructors only take vector types");
+        }
+        break;
+    case EOpConstructUint16:
+    case EOpConstructU16Vec2:
+    case EOpConstructU16Vec3:
+    case EOpConstructU16Vec4:
+    case EOpConstructInt16:
+    case EOpConstructI16Vec2:
+    case EOpConstructI16Vec3:
+    case EOpConstructI16Vec4:
+        if (type.isArray()) {
+            requireInt16Arithmetic(loc, "16-bit array constructors not supported");
+        }
+
+        if (type.isVector() && function.getParamCount() != 1) {
+            requireInt16Arithmetic(loc, "16-bit vector constructors only take vector types");
+        }
+        break;
+    case EOpConstructUint8:
+    case EOpConstructU8Vec2:
+    case EOpConstructU8Vec3:
+    case EOpConstructU8Vec4:
+    case EOpConstructInt8:
+    case EOpConstructI8Vec2:
+    case EOpConstructI8Vec3:
+    case EOpConstructI8Vec4:
+        if (type.isArray()) {
+            requireInt8Arithmetic(loc, "8-bit array constructors not supported");
+        }
+
+        if (type.isVector() && function.getParamCount() != 1) {
+            requireInt8Arithmetic(loc, "8-bit vector constructors only take vector types");
+        }
+        break;
+    default:
+        break;
     }
 
     // inherit constness from children
@@ -3012,6 +3161,16 @@ void TParseContext::parameterTypeCheck(const TSourceLoc& loc, TStorageQualifier
 {
     if ((qualifier == EvqOut || qualifier == EvqInOut) && type.isOpaque())
         error(loc, "samplers and atomic_uints cannot be output parameters", type.getBasicTypeString().c_str(), "");
+
+    if (!parsingBuiltins && type.containsBasicType(EbtFloat16)) {
+        requireFloat16Arithmetic(loc, "float16 types can only be in uniform block or buffer storage");
+    }
+    if (!parsingBuiltins && type.contains16BitInt()) {
+        requireInt16Arithmetic(loc, "(u)int16 types can only be in uniform block or buffer storage");
+    }
+    if (!parsingBuiltins && type.contains8BitInt()) {
+        requireInt8Arithmetic(loc, "(u)int8 types can only be in uniform block or buffer storage");
+    }
 }
 
 bool TParseContext::containsFieldWithBasicType(const TType& type, TBasicType basicType)
@@ -3786,6 +3945,39 @@ void TParseContext::opaqueCheck(const TSourceLoc& loc, const TType& type, const
         error(loc, "can't use with samplers or structs containing samplers", op, "");
 }
 
+void TParseContext::storage16BitAssignmentCheck(const TSourceLoc& loc, const TType& type, const char* op)
+{
+    if (type.getBasicType() == EbtStruct && containsFieldWithBasicType(type, EbtFloat16))
+        requireFloat16Arithmetic(loc, "can't use with structs containing float16");
+
+    if (type.isArray() && type.getBasicType() == EbtFloat16)
+        requireFloat16Arithmetic(loc, "can't use with arrays containing float16");
+
+    if (type.getBasicType() == EbtStruct && containsFieldWithBasicType(type, EbtInt16))
+        requireInt16Arithmetic(loc, "can't use with structs containing int16");
+
+    if (type.isArray() && type.getBasicType() == EbtInt16)
+        requireInt16Arithmetic(loc, "can't use with arrays containing int16");
+
+    if (type.getBasicType() == EbtStruct && containsFieldWithBasicType(type, EbtUint16))
+        requireInt16Arithmetic(loc, "can't use with structs containing uint16");
+
+    if (type.isArray() && type.getBasicType() == EbtUint16)
+        requireInt16Arithmetic(loc, "can't use with arrays containing uint16");
+
+    if (type.getBasicType() == EbtStruct && containsFieldWithBasicType(type, EbtInt8))
+        requireInt8Arithmetic(loc, "can't use with structs containing int8");
+
+    if (type.isArray() && type.getBasicType() == EbtInt8)
+        requireInt8Arithmetic(loc, "can't use with arrays containing int8");
+
+    if (type.getBasicType() == EbtStruct && containsFieldWithBasicType(type, EbtUint8))
+        requireInt8Arithmetic(loc, "can't use with structs containing uint8");
+
+    if (type.isArray() && type.getBasicType() == EbtUint8)
+        requireInt8Arithmetic(loc, "can't use with arrays containing uint8");
+}
+
 void TParseContext::specializationCheck(const TSourceLoc& loc, const TType& type, const char* op)
 {
     if (type.containsSpecializationSize())
@@ -5389,6 +5581,18 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
     atomicUintCheck(loc, type, identifier);
     transparentOpaqueCheck(loc, type, identifier);
 
+    if (type.getQualifier().storage != EvqUniform && type.getQualifier().storage != EvqBuffer) {
+        if (type.containsBasicType(EbtFloat16)) {
+            requireFloat16Arithmetic(loc, "float16 types can only be in uniform block or buffer storage");
+        }
+        if (type.contains16BitInt()) {
+            requireInt16Arithmetic(loc, "(u)int16 types can only be in uniform block or buffer storage");
+        }
+        if (type.contains8BitInt()) {
+            requireInt8Arithmetic(loc, "(u)int8 types can only be in uniform block or buffer storage");
+        }
+    }
+
     if (identifier != "gl_FragCoord" && (publicType.shaderQualifiers.originUpperLeft || publicType.shaderQualifiers.pixelCenterInteger))
         error(loc, "can only apply origin_upper_left and pixel_center_origin to gl_FragCoord", "layout qualifier", "");
     if (identifier != "gl_FragDepth" && publicType.shaderQualifiers.layoutDepth != EldNone)

3rdparty/glslang/glslang/MachineIndependent/ParseHelper.h

@@ -367,6 +367,7 @@ public:
     void nestedStructCheck(const TSourceLoc&);
     void arrayObjectCheck(const TSourceLoc&, const TType&, const char* op);
     void opaqueCheck(const TSourceLoc&, const TType&, const char* op);
+    void storage16BitAssignmentCheck(const TSourceLoc&, const TType&, const char* op);
     void specializationCheck(const TSourceLoc&, const TType&, const char* op);
     void structTypeCheck(const TSourceLoc&, TPublicType&);
     void inductiveLoopCheck(const TSourceLoc&, TIntermNode* init, TIntermLoop* loop);

3rdparty/glslang/glslang/MachineIndependent/Scan.cpp

@@ -1110,6 +1110,7 @@ int TScanContext::tokenizeIdentifier()
         afterType = true;
         if (parseContext.symbolTable.atBuiltInLevel() ||
             ((parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_8bit_storage) ||
               parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int8)) &&
               parseContext.profile != EEsProfile && parseContext.version >= 450))
             return keyword;
@@ -1130,6 +1131,7 @@ int TScanContext::tokenizeIdentifier()
 #ifdef AMD_EXTENSIONS
               parseContext.extensionTurnedOn(E_GL_AMD_gpu_shader_int16) ||
 #endif
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_16bit_storage) ||
               parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
               parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int16))))
             return keyword;
@@ -1201,6 +1203,20 @@ int TScanContext::tokenizeIdentifier()
     case F16VEC2:
     case F16VEC3:
     case F16VEC4:
+        afterType = true;
+        if (parseContext.symbolTable.atBuiltInLevel() ||
+            (parseContext.profile != EEsProfile && parseContext.version >= 450 &&
+             (
+#ifdef AMD_EXTENSIONS
+              parseContext.extensionTurnedOn(E_GL_AMD_gpu_shader_half_float) ||
+#endif
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_16bit_storage) ||
+              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
+              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_float16))))
+            return keyword;
+
+        return identifierOrType();
+
     case F16MAT2:
     case F16MAT3:
     case F16MAT4:

3rdparty/glslang/glslang/MachineIndependent/Versions.cpp

@@ -200,6 +200,10 @@ void TParseVersions::initializeExtensionBehavior()
     extensionBehavior[E_GL_EXT_post_depth_coverage]                     = EBhDisable;
     extensionBehavior[E_GL_EXT_control_flow_attributes]                 = EBhDisable;
     extensionBehavior[E_GL_EXT_nonuniform_qualifier]                    = EBhDisable;
+    extensionBehavior[E_GL_EXT_samplerless_texture_functions]           = EBhDisable;
+
+    extensionBehavior[E_GL_EXT_shader_16bit_storage]                    = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_8bit_storage]                     = EBhDisable;
 
     // #line and #include
     extensionBehavior[E_GL_GOOGLE_cpp_style_line_directive]          = EBhDisable;
@@ -362,6 +366,9 @@ void TParseVersions::getPreamble(std::string& preamble)
             "#define GL_EXT_post_depth_coverage 1\n"
             "#define GL_EXT_control_flow_attributes 1\n"
             "#define GL_EXT_nonuniform_qualifier 1\n"
+            "#define GL_EXT_shader_16bit_storage 1\n"
+            "#define GL_EXT_shader_8bit_storage 1\n"
+            "#define GL_EXT_samplerless_texture_functions 1\n"
 
             // GL_KHR_shader_subgroup
             "#define GL_KHR_shader_subgroup_basic 1\n"
@@ -811,27 +818,94 @@ void TParseVersions::fullIntegerCheck(const TSourceLoc& loc, const char* op)
 void TParseVersions::doubleCheck(const TSourceLoc& loc, const char* op)
 {
     requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-    profileRequires(loc, ECoreProfile, 400, nullptr, op);
-    profileRequires(loc, ECompatibilityProfile, 400, nullptr, op);
+    profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
 }
 
 // Call for any operation needing GLSL float16 data-type support.
 void TParseVersions::float16Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (!builtIn) {
+        const char* const extensions[] = {
 #if AMD_EXTENSIONS
-        const char* const extensions[3] = {E_GL_AMD_gpu_shader_half_float,
+                                           E_GL_AMD_gpu_shader_half_float,
+#endif
                                            E_GL_KHX_shader_explicit_arithmetic_types,
                                            E_GL_KHX_shader_explicit_arithmetic_types_float16};
+        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types");
+    }
+}
 
-#else
-        const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_float16};
+bool TParseVersions::float16Arithmetic()
+{
+    const char* const extensions[] = {
+#if AMD_EXTENSIONS
+                                       E_GL_AMD_gpu_shader_half_float,
+#endif
+                                       E_GL_KHX_shader_explicit_arithmetic_types,
+                                       E_GL_KHX_shader_explicit_arithmetic_types_float16};
+    return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
+}
+
+bool TParseVersions::int16Arithmetic()
+{
+    const char* const extensions[] = {
+#if AMD_EXTENSIONS
+                                       E_GL_AMD_gpu_shader_int16,
+#endif
+                                       E_GL_KHX_shader_explicit_arithmetic_types,
+                                       E_GL_KHX_shader_explicit_arithmetic_types_int16};
+    return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
+}
+
+bool TParseVersions::int8Arithmetic()
+{
+    const char* const extensions[] = {
+                                       E_GL_KHX_shader_explicit_arithmetic_types,
+                                       E_GL_KHX_shader_explicit_arithmetic_types_int8};
+    return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
+}
+
+void TParseVersions::requireFloat16Arithmetic(const TSourceLoc& loc, const char* featureDesc)
+{
+    const char* const extensions[] = {
+#if AMD_EXTENSIONS
+                                       E_GL_AMD_gpu_shader_half_float,
+#endif
+                                       E_GL_KHX_shader_explicit_arithmetic_types,
+                                       E_GL_KHX_shader_explicit_arithmetic_types_float16};
+    requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, featureDesc);
+}
+
+void TParseVersions::requireInt16Arithmetic(const TSourceLoc& loc, const char* featureDesc)
+{
+    const char* const extensions[] = {
+#if AMD_EXTENSIONS
+                                       E_GL_AMD_gpu_shader_int16,
+#endif
+                                       E_GL_KHX_shader_explicit_arithmetic_types,
+                                       E_GL_KHX_shader_explicit_arithmetic_types_int16};
+    requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, featureDesc);
+}
+
+void TParseVersions::requireInt8Arithmetic(const TSourceLoc& loc, const char* featureDesc)
+{
+    const char* const extensions[] = {
+                                       E_GL_KHX_shader_explicit_arithmetic_types,
+                                       E_GL_KHX_shader_explicit_arithmetic_types_int8};
+    requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, featureDesc);
+}
+
+void TParseVersions::float16ScalarVectorCheck(const TSourceLoc& loc, const char* op, bool builtIn)
+{
+    if (!builtIn) {
+        const char* const extensions[] = {
+#if AMD_EXTENSIONS
+                                           E_GL_AMD_gpu_shader_half_float,
 #endif
+                                           E_GL_EXT_shader_16bit_storage,
+                                           E_GL_KHX_shader_explicit_arithmetic_types,
+                                           E_GL_KHX_shader_explicit_arithmetic_types_float16};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types");
-        requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        profileRequires(loc, ECoreProfile, 450, nullptr, op);
-        profileRequires(loc, ECompatibilityProfile, 450, nullptr, op);
     }
 }
 
@@ -842,9 +916,6 @@ void TParseVersions::explicitFloat32Check(const TSourceLoc& loc, const char* op,
         const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
                                            E_GL_KHX_shader_explicit_arithmetic_types_float32};
         requireExtensions(loc, 2, extensions, "explicit types");
-        requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        profileRequires(loc, ECoreProfile, 450, nullptr, op);
-        profileRequires(loc, ECompatibilityProfile, 450, nullptr, op);
     }
 }
 
@@ -856,8 +927,7 @@ void TParseVersions::explicitFloat64Check(const TSourceLoc& loc, const char* op,
                                            E_GL_KHX_shader_explicit_arithmetic_types_float64};
         requireExtensions(loc, 2, extensions, "explicit types");
         requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        profileRequires(loc, ECoreProfile, 450, nullptr, op);
-        profileRequires(loc, ECompatibilityProfile, 450, nullptr, op);
+        profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
     }
 }
 
@@ -868,9 +938,6 @@ void TParseVersions::explicitInt8Check(const TSourceLoc& loc, const char* op, bo
         const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
                                            E_GL_KHX_shader_explicit_arithmetic_types_int8};
         requireExtensions(loc, 2, extensions, "explicit types");
-        requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        profileRequires(loc, ECoreProfile, 450, nullptr, op);
-        profileRequires(loc, ECompatibilityProfile, 450, nullptr, op);
     }
 }
 
@@ -881,8 +948,7 @@ void TParseVersions::float16OpaqueCheck(const TSourceLoc& loc, const char* op, b
     if (! builtIn) {
         requireExtensions(loc, 1, &E_GL_AMD_gpu_shader_half_float_fetch, op);
         requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        profileRequires(loc, ECoreProfile, 450, nullptr, op);
-        profileRequires(loc, ECompatibilityProfile, 450, nullptr, op);
+        profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
     }
 }
 #endif
@@ -891,18 +957,38 @@ void TParseVersions::float16OpaqueCheck(const TSourceLoc& loc, const char* op, b
 void TParseVersions::explicitInt16Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (! builtIn) {
+    	const char* const extensions[] = {
 #if AMD_EXTENSIONS
-        const char* const extensions[3] = {E_GL_AMD_gpu_shader_int16,
-                                            E_GL_KHX_shader_explicit_arithmetic_types,
-                                            E_GL_KHX_shader_explicit_arithmetic_types_int16};
-#else
-        const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
-                                            E_GL_KHX_shader_explicit_arithmetic_types_int16};
+                                           E_GL_AMD_gpu_shader_int16,
 #endif
+                                           E_GL_KHX_shader_explicit_arithmetic_types,
+                                           E_GL_KHX_shader_explicit_arithmetic_types_int16};
+        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types");
+    }
+}
+
+void TParseVersions::int16ScalarVectorCheck(const TSourceLoc& loc, const char* op, bool builtIn)
+{
+    if (! builtIn) {
+    	const char* const extensions[] = {
+#if AMD_EXTENSIONS
+                                           E_GL_AMD_gpu_shader_int16,
+#endif
+                                           E_GL_EXT_shader_16bit_storage,
+                                           E_GL_KHX_shader_explicit_arithmetic_types,
+                                           E_GL_KHX_shader_explicit_arithmetic_types_int16};
+        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types");
+    }
+}
+
+void TParseVersions::int8ScalarVectorCheck(const TSourceLoc& loc, const char* op, bool builtIn)
+{
+    if (! builtIn) {
+    	const char* const extensions[] = {
+                                           E_GL_EXT_shader_8bit_storage,
+                                           E_GL_KHX_shader_explicit_arithmetic_types,
+                                           E_GL_KHX_shader_explicit_arithmetic_types_int8};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types");
-        requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        profileRequires(loc, ECoreProfile, 450, nullptr, op);
-        profileRequires(loc, ECompatibilityProfile, 450, nullptr, op);
     }
 }
 
@@ -913,9 +999,6 @@ void TParseVersions::explicitInt32Check(const TSourceLoc& loc, const char* op, b
         const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
                                            E_GL_KHX_shader_explicit_arithmetic_types_int32};
         requireExtensions(loc, 2, extensions, "explicit types");
-        requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        profileRequires(loc, ECoreProfile, 450, nullptr, op);
-        profileRequires(loc, ECompatibilityProfile, 450, nullptr, op);
     }
 }
 
@@ -928,8 +1011,7 @@ void TParseVersions::int64Check(const TSourceLoc& loc, const char* op, bool buil
                                            E_GL_KHX_shader_explicit_arithmetic_types_int64};
         requireExtensions(loc, 3, extensions, "shader int64");
         requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        profileRequires(loc, ECoreProfile, 450, nullptr, op);
-        profileRequires(loc, ECompatibilityProfile, 450, nullptr, op);
+        profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
     }
 }
 

3rdparty/glslang/glslang/MachineIndependent/Versions.h

@@ -152,12 +152,17 @@ const char* const E_GL_KHR_shader_subgroup_quad             = "GL_KHR_shader_sub
 const char* const E_GL_EXT_shader_non_constant_global_initializers = "GL_EXT_shader_non_constant_global_initializers";
 const char* const E_GL_EXT_shader_image_load_formatted = "GL_EXT_shader_image_load_formatted";
 
+const char* const E_GL_EXT_shader_16bit_storage             = "GL_EXT_shader_16bit_storage";
+const char* const E_GL_EXT_shader_8bit_storage              = "GL_EXT_shader_8bit_storage";
+
+
 // EXT extensions
-const char* const E_GL_EXT_device_group                 = "GL_EXT_device_group";
-const char* const E_GL_EXT_multiview                    = "GL_EXT_multiview";
-const char* const E_GL_EXT_post_depth_coverage          = "GL_EXT_post_depth_coverage";
-const char* const E_GL_EXT_control_flow_attributes      = "GL_EXT_control_flow_attributes";
-const char* const E_GL_EXT_nonuniform_qualifier         = "GL_EXT_nonuniform_qualifier";
+const char* const E_GL_EXT_device_group                     = "GL_EXT_device_group";
+const char* const E_GL_EXT_multiview                        = "GL_EXT_multiview";
+const char* const E_GL_EXT_post_depth_coverage              = "GL_EXT_post_depth_coverage";
+const char* const E_GL_EXT_control_flow_attributes          = "GL_EXT_control_flow_attributes";
+const char* const E_GL_EXT_nonuniform_qualifier             = "GL_EXT_nonuniform_qualifier";
+const char* const E_GL_EXT_samplerless_texture_functions    = "GL_EXT_samplerless_texture_functions";
 
 // Arrays of extensions for the above viewportEXTs duplications
 

3rdparty/glslang/glslang/MachineIndependent/glslang.y

@@ -699,6 +699,7 @@ assignment_expression
     | unary_expression assignment_operator assignment_expression {
         parseContext.arrayObjectCheck($2.loc, $1->getType(), "array assignment");
         parseContext.opaqueCheck($2.loc, $1->getType(), "=");
+        parseContext.storage16BitAssignmentCheck($2.loc, $1->getType(), "=");
         parseContext.specializationCheck($2.loc, $1->getType(), "=");
         parseContext.lValueErrorCheck($2.loc, "assign", $1);
         parseContext.rValueErrorCheck($2.loc, "assign", $3);
@@ -1419,7 +1420,7 @@ type_specifier_nonarray
         $$.basicType = EbtDouble;
     }
     | FLOAT16_T {
-        parseContext.float16Check($1.loc, "float16_t", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.float16ScalarVectorCheck($1.loc, "float16_t", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtFloat16;
     }
@@ -1443,22 +1444,22 @@ type_specifier_nonarray
         $$.basicType = EbtUint;
     }
     | INT8_T {
-        parseContext.explicitInt8Check($1.loc, "8-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int8ScalarVectorCheck($1.loc, "8-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtInt8;
     }
     | UINT8_T {
-        parseContext.explicitInt8Check($1.loc, "8-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int8ScalarVectorCheck($1.loc, "8-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtUint8;
     }
     | INT16_T {
-        parseContext.explicitInt16Check($1.loc, "16-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int16ScalarVectorCheck($1.loc, "16-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtInt16;
     }
     | UINT16_T {
-        parseContext.explicitInt16Check($1.loc, "16-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int16ScalarVectorCheck($1.loc, "16-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtUint16;
     }
@@ -1520,19 +1521,19 @@ type_specifier_nonarray
         $$.setVector(4);
     }
     | F16VEC2 {
-        parseContext.float16Check($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.float16ScalarVectorCheck($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtFloat16;
         $$.setVector(2);
     }
     | F16VEC3 {
-        parseContext.float16Check($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.float16ScalarVectorCheck($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtFloat16;
         $$.setVector(3);
     }
     | F16VEC4 {
-        parseContext.float16Check($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.float16ScalarVectorCheck($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtFloat16;
         $$.setVector(4);
@@ -1604,40 +1605,40 @@ type_specifier_nonarray
         $$.setVector(4);
     }
     | I8VEC2 {
-       parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-       $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-       $$.basicType = EbtInt8;
-       $$.setVector(2);
+        parseContext.int8ScalarVectorCheck($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
+        $$.basicType = EbtInt8;
+        $$.setVector(2);
     }
     | I8VEC3 {
-       parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-       $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-       $$.basicType = EbtInt8;
-       $$.setVector(3);
+        parseContext.int8ScalarVectorCheck($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
+        $$.basicType = EbtInt8;
+        $$.setVector(3);
     }
     | I8VEC4 {
-       parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-       $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-       $$.basicType = EbtInt8;
-       $$.setVector(4);
+        parseContext.int8ScalarVectorCheck($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
+        $$.basicType = EbtInt8;
+        $$.setVector(4);
     }
     | I16VEC2 {
-       parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-       $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-       $$.basicType = EbtInt16;
-       $$.setVector(2);
+        parseContext.int16ScalarVectorCheck($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
+        $$.basicType = EbtInt16;
+        $$.setVector(2);
     }
     | I16VEC3 {
-       parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-       $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-       $$.basicType = EbtInt16;
-       $$.setVector(3);
+        parseContext.int16ScalarVectorCheck($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
+        $$.basicType = EbtInt16;
+        $$.setVector(3);
     }
     | I16VEC4 {
-       parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-       $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-       $$.basicType = EbtInt16;
-       $$.setVector(4);
+        parseContext.int16ScalarVectorCheck($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
+        $$.basicType = EbtInt16;
+        $$.setVector(4);
     }
     | I32VEC2 {
         parseContext.explicitInt32Check($1.loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
@@ -1694,37 +1695,37 @@ type_specifier_nonarray
         $$.setVector(4);
     }
     | U8VEC2 {
-        parseContext.explicitInt8Check($1.loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int8ScalarVectorCheck($1.loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtUint8;
         $$.setVector(2);
     }
     | U8VEC3 {
-        parseContext.explicitInt8Check($1.loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int8ScalarVectorCheck($1.loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtInt8;
+        $$.basicType = EbtUint8;
         $$.setVector(3);
     }
     | U8VEC4 {
-        parseContext.explicitInt8Check($1.loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int8ScalarVectorCheck($1.loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtUint8;
         $$.setVector(4);
     }
     | U16VEC2 {
-        parseContext.explicitInt16Check($1.loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int16ScalarVectorCheck($1.loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtUint16;
         $$.setVector(2);
     }
     | U16VEC3 {
-        parseContext.explicitInt16Check($1.loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int16ScalarVectorCheck($1.loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtUint16;
         $$.setVector(3);
     }
     | U16VEC4 {
-        parseContext.explicitInt16Check($1.loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        parseContext.int16ScalarVectorCheck($1.loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtUint16;
         $$.setVector(4);

3rdparty/glslang/glslang/MachineIndependent/parseVersions.h

@@ -79,6 +79,15 @@ public:
     virtual void fullIntegerCheck(const TSourceLoc&, const char* op);
     virtual void doubleCheck(const TSourceLoc&, const char* op);
     virtual void float16Check(const TSourceLoc&, const char* op, bool builtIn = false);
+    virtual void float16ScalarVectorCheck(const TSourceLoc&, const char* op, bool builtIn = false);
+    virtual bool float16Arithmetic();
+    virtual void requireFloat16Arithmetic(const TSourceLoc& loc, const char* featureDesc);
+    virtual void int16ScalarVectorCheck(const TSourceLoc&, const char* op, bool builtIn = false);
+    virtual bool int16Arithmetic();
+    virtual void requireInt16Arithmetic(const TSourceLoc& loc, const char* featureDesc);
+    virtual void int8ScalarVectorCheck(const TSourceLoc&, const char* op, bool builtIn = false);
+    virtual bool int8Arithmetic();
+    virtual void requireInt8Arithmetic(const TSourceLoc& loc, const char* featureDesc);
 #ifdef AMD_EXTENSIONS
     virtual void float16OpaqueCheck(const TSourceLoc&, const char* op, bool builtIn = false);
 #endif

3rdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp

@@ -515,15 +515,16 @@ int TPpContext::eval(int token, int precedence, bool shortCircuit, int& res, boo
 int TPpContext::evalToToken(int token, bool shortCircuit, int& res, bool& err, TPpToken* ppToken)
 {
     while (token == PpAtomIdentifier && strcmp("defined", ppToken->name) != 0) {
-        int macroReturn = MacroExpand(ppToken, true, false);
-        if (macroReturn == 0) {
+        switch (MacroExpand(ppToken, true, false)) {
+        case MacroExpandNotStarted:
+        case MacroExpandError:
             parseContext.ppError(ppToken->loc, "can't evaluate expression", "preprocessor evaluation", "");
             err = true;
             res = 0;
-            token = scanToken(ppToken);
             break;
-        }
-        if (macroReturn == -1) {
+        case MacroExpandStarted:
+            break;
+        case MacroExpandUndef:
             if (! shortCircuit && parseContext.profile == EEsProfile) {
                 const char* message = "undefined macro in expression not allowed in es profile";
                 if (parseContext.relaxedErrors())
@@ -531,8 +532,11 @@ int TPpContext::evalToToken(int token, bool shortCircuit, int& res, bool& err, T
                 else
                     parseContext.ppError(ppToken->loc, message, "preprocessor evaluation", ppToken->name);
             }
+            break;
         }
         token = scanToken(ppToken);
+        if (err)
+            break;
     }
 
     return token;
@@ -1011,15 +1015,25 @@ TPpContext::TokenStream* TPpContext::PrescanMacroArg(TokenStream& arg, TPpToken*
     int token;
     while ((token = scanToken(ppToken)) != tMarkerInput::marker && token != EndOfInput) {
         token = tokenPaste(token, *ppToken);
+        if (token == PpAtomIdentifier) {
+            switch (MacroExpand(ppToken, false, newLineOkay)) {
+            case MacroExpandNotStarted:
+                break;
+            case MacroExpandError:
+                token = EndOfInput;
+                break;
+            case MacroExpandStarted:
+            case MacroExpandUndef:
+                continue;
+            }
+        }
         if (token == tMarkerInput::marker || token == EndOfInput)
             break;
-        if (token == PpAtomIdentifier && MacroExpand(ppToken, false, newLineOkay) != 0)
-            continue;
         expandedArg->putToken(token, ppToken);
     }
 
     if (token == EndOfInput) {
-        // MacroExpand ate the marker, so had bad input, recover
+        // Error, or MacroExpand ate the marker, so had bad input, recover
         delete expandedArg;
         expandedArg = nullptr;
     } else {
@@ -1115,14 +1129,18 @@ int TPpContext::tZeroInput::scan(TPpToken* ppToken)
 }
 
 //
-// Check a token to see if it is a macro that should be expanded.
-// If it is, and defined, push a tInput that will produce the appropriate expansion
-// and return 1.
-// If it is, but undefined, and expandUndef is requested, push a tInput that will
-// expand to 0 and return -1.
-// Otherwise, return 0 to indicate no expansion, which is not necessarily an error.
+// Check a token to see if it is a macro that should be expanded:
+// - If it is, and defined, push a tInput that will produce the appropriate
+//   expansion and return MacroExpandStarted.
+// - If it is, but undefined, and expandUndef is requested, push a tInput
+//   that will expand to 0 and return MacroExpandUndef.
+// - Otherwise, there is no expansion, and there are two cases:
+//   * It might be okay there is no expansion, and no specific error was
+//     detected. Returns MacroExpandNotStarted.
+//   * The expansion was started, but could not be completed, due to an error
+//     that cannot be recovered from. Returns MacroExpandError.
 //
-int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOkay)
+MacroExpandResult TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOkay)
 {
     ppToken->space = false;
     int macroAtom = atomStrings.getAtom(ppToken->name);
@@ -1131,7 +1149,7 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
         ppToken->ival = parseContext.getCurrentLoc().line;
         snprintf(ppToken->name, sizeof(ppToken->name), "%d", ppToken->ival);
         UngetToken(PpAtomConstInt, ppToken);
-        return 1;
+        return MacroExpandStarted;
 
     case PpAtomFileMacro: {
         if (parseContext.getCurrentLoc().name)
@@ -1139,34 +1157,33 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
         ppToken->ival = parseContext.getCurrentLoc().string;
         snprintf(ppToken->name, sizeof(ppToken->name), "%s", ppToken->loc.getStringNameOrNum().c_str());
         UngetToken(PpAtomConstInt, ppToken);
-        return 1;
+        return MacroExpandStarted;
     }
 
     case PpAtomVersionMacro:
         ppToken->ival = parseContext.version;
         snprintf(ppToken->name, sizeof(ppToken->name), "%d", ppToken->ival);
         UngetToken(PpAtomConstInt, ppToken);
-        return 1;
+        return MacroExpandStarted;
 
     default:
         break;
     }
 
     MacroSymbol* macro = macroAtom == 0 ? nullptr : lookupMacroDef(macroAtom);
-    int depth = 0;
 
     // no recursive expansions
     if (macro != nullptr && macro->busy)
-        return 0;
+        return MacroExpandNotStarted;
 
     // not expanding undefined macros
     if ((macro == nullptr || macro->undef) && ! expandUndef)
-        return 0;
+        return MacroExpandNotStarted;
 
     // 0 is the value of an undefined macro
     if ((macro == nullptr || macro->undef) && expandUndef) {
         pushInput(new tZeroInput(this));
-        return -1;
+        return MacroExpandUndef;
     }
 
     tMacroInput *in = new tMacroInput(this);
@@ -1182,7 +1199,7 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
         if (token != '(') {
             UngetToken(token, ppToken);
             delete in;
-            return 0;
+            return MacroExpandNotStarted;
         }
         in->args.resize(in->mac->args.size());
         for (size_t i = 0; i < in->mac->args.size(); i++)
@@ -1193,39 +1210,44 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
         size_t arg = 0;
         bool tokenRecorded = false;
         do {
-            depth = 0;
-            while (1) {
+            TVector<char> nestStack;
+            while (true) {
                 token = scanToken(ppToken);
                 if (token == EndOfInput || token == tMarkerInput::marker) {
                     parseContext.ppError(loc, "End of input in macro", "macro expansion", atomStrings.getString(macroAtom));
                     delete in;
-                    return 0;
+                    return MacroExpandError;
                 }
                 if (token == '\n') {
                     if (! newLineOkay) {
                         parseContext.ppError(loc, "End of line in macro substitution:", "macro expansion", atomStrings.getString(macroAtom));
                         delete in;
-                        return 0;
+                        return MacroExpandError;
                     }
                     continue;
                 }
                 if (token == '#') {
                     parseContext.ppError(ppToken->loc, "unexpected '#'", "macro expansion", atomStrings.getString(macroAtom));
                     delete in;
-                    return 0;
+                    return MacroExpandError;
                 }
                 if (in->mac->args.size() == 0 && token != ')')
                     break;
-                if (depth == 0 && (token == ',' || token == ')'))
+                if (nestStack.size() == 0 && (token == ',' || token == ')'))
                     break;
                 if (token == '(')
-                    depth++;
-                if (token == ')')
-                    depth--;
+                    nestStack.push_back(')');
+                else if (token == '{' && parseContext.isReadingHLSL())
+                    nestStack.push_back('}');
+                else if (nestStack.size() > 0 && token == nestStack.back())
+                    nestStack.pop_back();
                 in->args[arg]->putToken(token, ppToken);
                 tokenRecorded = true;
             }
+            // end of single argument scan
+
             if (token == ')') {
+                // closing paren of call
                 if (in->mac->args.size() == 1 && tokenRecorded == 0)
                     break;
                 arg++;
@@ -1233,23 +1255,25 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
             }
             arg++;
         } while (arg < in->mac->args.size());
+        // end of all arguments scan
 
         if (arg < in->mac->args.size())
             parseContext.ppError(loc, "Too few args in Macro", "macro expansion", atomStrings.getString(macroAtom));
         else if (token != ')') {
-            depth=0;
+            // Error recover code; find end of call, if possible
+            int depth = 0;
             while (token != EndOfInput && (depth > 0 || token != ')')) {
-                if (token == ')')
+                if (token == ')' || token == '}')
                     depth--;
                 token = scanToken(ppToken);
-                if (token == '(')
+                if (token == '(' || token == '{')
                     depth++;
             }
 
             if (token == EndOfInput) {
                 parseContext.ppError(loc, "End of input in macro", "macro expansion", atomStrings.getString(macroAtom));
                 delete in;
-                return 0;
+                return MacroExpandError;
             }
             parseContext.ppError(loc, "Too many args in macro", "macro expansion", atomStrings.getString(macroAtom));
         }
@@ -1264,7 +1288,7 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
     macro->busy = 1;
     macro->body.reset();
 
-    return 1;
+    return MacroExpandStarted;
 }
 
 } // end namespace glslang

3rdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.h

@@ -183,6 +183,13 @@ protected:
 
 class TInputScanner;
 
+enum MacroExpandResult {
+    MacroExpandNotStarted, // macro not expanded, which might not be an error
+    MacroExpandError,      // a clear error occurred while expanding, no expansion
+    MacroExpandStarted,    // macro expansion process has started
+    MacroExpandUndef       // macro is undefined and will be expanded
+};
+
 // This class is the result of turning a huge pile of C code communicating through globals
 // into a class.  This was done to allowing instancing to attain thread safety.
 // Don't expect too much in terms of OO design.
@@ -400,7 +407,7 @@ protected:
     int readCPPline(TPpToken * ppToken);
     int scanHeaderName(TPpToken* ppToken, char delimit);
     TokenStream* PrescanMacroArg(TokenStream&, TPpToken*, bool newLineOkay);
-    int MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOkay);
+    MacroExpandResult MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOkay);
 
     //
     // From PpTokens.cpp

3rdparty/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp

@@ -1061,8 +1061,17 @@ int TPpContext::tokenize(TPpToken& ppToken)
             continue;
 
         // expand macros
-        if (token == PpAtomIdentifier && MacroExpand(&ppToken, false, true) != 0)
-            continue;
+        if (token == PpAtomIdentifier) {
+            switch (MacroExpand(&ppToken, false, true)) {
+            case MacroExpandNotStarted:
+                break;
+            case MacroExpandError:
+                return EndOfInput;
+            case MacroExpandStarted:
+            case MacroExpandUndef:
+                continue;
+            }
+        }
 
         switch (token) {
         case PpAtomIdentifier:

3rdparty/glslang/glslang/Public/ShaderLang.h

@@ -70,7 +70,7 @@
 // This should always increase, as some paths to do not consume
 // a more major number.
 // It should increment by one when new functionality is added.
-#define GLSLANG_MINOR_VERSION 7
+#define GLSLANG_MINOR_VERSION 8
 
 //
 // Call before doing any other compiler/linker operations.

3rdparty/glslang/gtests/Pp.FromFile.cpp

@@ -50,6 +50,7 @@ TEST_P(PreprocessingTest, FromFile)
 INSTANTIATE_TEST_CASE_P(
     Glsl, PreprocessingTest,
     ::testing::ValuesIn(std::vector<std::string>({
+        "preprocessor.bad_arg.vert",
         "preprocessor.cpp_style_line_directive.vert",
         "preprocessor.cpp_style___FILE__.vert",
         "preprocessor.edge_cases.vert",

3rdparty/glslang/gtests/Spv.FromFile.cpp

@@ -215,6 +215,12 @@ INSTANTIATE_TEST_CASE_P(
         "spv.140.frag",
         "spv.150.geom",
         "spv.150.vert",
+        "spv.16bitstorage.frag",
+        "spv.16bitstorage_Error.frag",
+        "spv.16bitstorage-int.frag",
+        "spv.16bitstorage_Error-int.frag",
+        "spv.16bitstorage-uint.frag",
+        "spv.16bitstorage_Error-uint.frag",
         "spv.300BuiltIns.vert",
         "spv.300layout.frag",
         "spv.300layout.vert",
@@ -231,6 +237,10 @@ INSTANTIATE_TEST_CASE_P(
         "spv.450.tesc",
         "spv.450.geom",
         "spv.450.noRedecl.tesc",
+        "spv.8bitstorage-int.frag",
+        "spv.8bitstorage_Error-int.frag",
+        "spv.8bitstorage-uint.frag",
+        "spv.8bitstorage_Error-uint.frag",
         "spv.accessChain.frag",
         "spv.aggOps.frag",
         "spv.always-discard.frag",
@@ -344,6 +354,7 @@ INSTANTIATE_TEST_CASE_P(
         "spv.xfb.vert",
         "spv.xfb2.vert",
         "spv.xfb3.vert",
+        "spv.samplerlessTextureFunctions.frag",
     })),
     FileNameAsCustomTestSuffix
 );
@@ -433,6 +444,7 @@ INSTANTIATE_TEST_CASE_P(
         "vulkan.frag",
         "vulkan.vert",
         "vulkan.comp",
+        "samplerlessTextureFunctions.frag",
     })),
     FileNameAsCustomTestSuffix
 );

3rdparty/glslang/hlsl/hlslParseHelper.cpp

@@ -4377,16 +4377,13 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
             txquerylod->getSequence().push_back(txcombine);
             txquerylod->getSequence().push_back(argCoord);
 
-            TIntermTyped* lodComponent = intermediate.addConstantUnion(0, loc, true);
+            TIntermTyped* lodComponent = intermediate.addConstantUnion(
+                op == EOpMethodCalculateLevelOfDetail ? 0 : 1,
+                loc, true);
             TIntermTyped* lodComponentIdx = intermediate.addIndex(EOpIndexDirect, txquerylod, lodComponent, loc);
             lodComponentIdx->setType(TType(EbtFloat, EvqTemporary, 1));
-
             node = lodComponentIdx;
 
-            // We cannot currently obtain the unclamped LOD
-            if (op == EOpMethodCalculateLevelOfDetailUnclamped)
-                error(loc, "unimplemented: CalculateLevelOfDetailUnclamped", "", "");
-
             break;
         }
 

3rdparty/glslang/known_good_khr.json

@@ -12,7 +12,7 @@
       "site" : "gitlab",
       "subrepo" : "spirv/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "4082a777bd5df31ed45acf40e64263094e85ed2e"
+      "commit" : "gitlab-prelim-rc4"
     }
   ]
 }