another update of bgfx and added its bimg dependency

3rdparty/bgfx/3rdparty/glslang/SPIRV/GlslangToSpv.cpp

@@ -222,8 +222,7 @@ spv::SourceLanguage TranslateSourceLanguage(glslang::EShSource source, EProfile
             return spv::SourceLanguageUnknown;
         }
     case glslang::EShSourceHlsl:
-        // Use SourceLanguageUnknown instead of SourceLanguageHLSL for now, until Vulkan knows what HLSL is
+        return spv::SourceLanguageHLSL;
-        return spv::SourceLanguageUnknown;
     default:
         return spv::SourceLanguageUnknown;
     }
@@ -869,14 +868,20 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(const glslang::TIntermediate* gls
         builder.addCapability(spv::CapabilityShader);
         break;
 
+    case EShLangTessEvaluation:
     case EShLangTessControl:
         builder.addCapability(spv::CapabilityTessellation);
-        builder.addExecutionMode(shaderEntry, spv::ExecutionModeOutputVertices, glslangIntermediate->getVertices());
-        break;
 
-    case EShLangTessEvaluation:
+        glslang::TLayoutGeometry primitive;
-        builder.addCapability(spv::CapabilityTessellation);
+
-        switch (glslangIntermediate->getInputPrimitive()) {
+        if (glslangIntermediate->getStage() == EShLangTessControl) {
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeOutputVertices, glslangIntermediate->getVertices());
+            primitive = glslangIntermediate->getOutputPrimitive();
+        } else {
+            primitive = glslangIntermediate->getInputPrimitive();
+        }
+
+        switch (primitive) {
         case glslang::ElgTriangles:           mode = spv::ExecutionModeTriangles;     break;
         case glslang::ElgQuads:               mode = spv::ExecutionModeQuads;         break;
         case glslang::ElgIsolines:            mode = spv::ExecutionModeIsolines;      break;
@@ -1823,7 +1828,15 @@ bool TGlslangToSpvTraverser::visitSelection(glslang::TVisit /* visit */, glslang
         node->getFalseBlock()->traverse(this);
         spv::Id falseValue = accessChainLoad(node->getTrueBlock()->getAsTyped()->getType());
 
-        spv::Id select = builder.createTriOp(spv::OpSelect, convertGlslangToSpvType(node->getType()), condition, trueValue, falseValue);
+        // smear condition to vector, if necessary (AST is always scalar)
+        if (builder.isVector(trueValue))
+            condition = builder.smearScalar(spv::NoPrecision, condition, 
+                                            builder.makeVectorType(builder.makeBoolType(),
+                                                                   builder.getNumComponents(trueValue)));
+
+        spv::Id select = builder.createTriOp(spv::OpSelect,
+                                             convertGlslangToSpvType(node->getType()), condition,
+                                                                     trueValue, falseValue);
         builder.clearAccessChain();
         builder.setAccessChainRValue(select);
     };
@@ -2272,12 +2285,21 @@ bool TGlslangToSpvTraverser::filterMember(const glslang::TType& member)
 {
     auto& extensions = glslangIntermediate->getRequestedExtensions();
 
+    if (member.getFieldName() == "gl_ViewportMask" &&
+        extensions.find("GL_NV_viewport_array2") == extensions.end())
+        return true;
+    if (member.getFieldName() == "gl_SecondaryViewportMaskNV" &&
+        extensions.find("GL_NV_stereo_view_rendering") == extensions.end())
+        return true;
     if (member.getFieldName() == "gl_SecondaryPositionNV" &&
         extensions.find("GL_NV_stereo_view_rendering") == extensions.end())
         return true;
     if (member.getFieldName() == "gl_PositionPerViewNV" &&
         extensions.find("GL_NVX_multiview_per_view_attributes") == extensions.end())
         return true;
+    if (member.getFieldName() == "gl_ViewportMaskPerViewNV" &&
+        extensions.find("GL_NVX_multiview_per_view_attributes") == extensions.end())
+        return true;
 
     return false;
 };
@@ -2705,7 +2727,23 @@ void TGlslangToSpvTraverser::updateMemberOffset(const glslang::TType& /*structTy
     int memberSize;
     int dummyStride;
     int memberAlignment = glslangIntermediate->getBaseAlignment(memberType, memberSize, dummyStride, explicitLayout == glslang::ElpStd140, matrixLayout == glslang::ElmRowMajor);
+
+    // Adjust alignment for HLSL rules
+    if (glslangIntermediate->usingHlslOFfsets() &&
+        ! memberType.isArray() && memberType.isVector()) {
+        int dummySize;
+        int componentAlignment = glslangIntermediate->getBaseAlignmentScalar(memberType, dummySize);
+        if (componentAlignment <= 4)
+            memberAlignment = componentAlignment;
+    }
+
+    // Bump up to member alignment
     glslang::RoundToPow2(currentOffset, memberAlignment);
+
+    // Bump up to vec4 if there is a bad straddle
+    if (glslangIntermediate->improperStraddle(memberType, memberSize, currentOffset))
+        glslang::RoundToPow2(currentOffset, 16);
+
     nextOffset = currentOffset + memberSize;
 }
 
@@ -2777,7 +2815,7 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF
             if (paramType.containsOpaque() ||                                // sampler, etc.
                 (paramType.getBasicType() == glslang::EbtBlock &&
                  paramType.getQualifier().storage == glslang::EvqBuffer) ||  // SSBO
-                 p == 0 && implicitThis)                                     // implicit 'this'
+                (p == 0 && implicitThis))                                    // implicit 'this'
                 typeId = builder.makePointer(TranslateStorageClass(paramType), typeId);
             else if (paramType.getQualifier().storage != glslang::EvqConstReadOnly)
                 typeId = builder.makePointer(spv::StorageClassFunction, typeId);
@@ -4609,6 +4647,9 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
     spv::Id typeId0 = 0;
     if (consumedOperands > 0)
         typeId0 = builder.getTypeId(operands[0]);
+    spv::Id typeId1 = 0;
+    if (consumedOperands > 1)
+        typeId1 = builder.getTypeId(operands[1]);
     spv::Id frexpIntType = 0;
 
     switch (op) {
@@ -4730,13 +4771,22 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
         libCall = spv::GLSLstd450Fma;
         break;
     case glslang::EOpFrexp:
+        {
             libCall = spv::GLSLstd450FrexpStruct;
+            assert(builder.isPointerType(typeId1));
+            typeId1 = builder.getContainedTypeId(typeId1);
+#ifdef AMD_EXTENSIONS
+            int width = builder.getScalarTypeWidth(typeId1);
+#else
+            int width = 32;
+#endif
             if (builder.getNumComponents(operands[0]) == 1)
-            frexpIntType = builder.makeIntegerType(32, true);
+                frexpIntType = builder.makeIntegerType(width, true);
             else
-            frexpIntType = builder.makeVectorType(builder.makeIntegerType(32, true), builder.getNumComponents(operands[0]));
+                frexpIntType = builder.makeVectorType(builder.makeIntegerType(width, true), builder.getNumComponents(operands[0]));
             typeId = builder.makeStructResultType(typeId0, frexpIntType);
             consumedOperands = 1;
+        }
         break;
     case glslang::EOpLdexp:
         libCall = spv::GLSLstd450Ldexp;
@@ -4844,9 +4894,18 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
         builder.createStore(builder.createCompositeExtract(id, typeId0, 1), operands[2]);
         break;
     case glslang::EOpFrexp:
+        {
             assert(operands.size() == 2);
+            if (builder.isFloatType(builder.getScalarTypeId(typeId1))) {
+                // "exp" is floating-point type (from HLSL intrinsic)
+                spv::Id member1 = builder.createCompositeExtract(id, frexpIntType, 1);
+                member1 = builder.createUnaryOp(spv::OpConvertSToF, typeId1, member1);
+                builder.createStore(member1, operands[1]);
+            } else
+                // "exp" is integer type (from GLSL built-in function)
                 builder.createStore(builder.createCompositeExtract(id, frexpIntType, 1), operands[1]);
             id = builder.createCompositeExtract(id, typeId0, 0);
+        }
         break;
     default:
         break;

3rdparty/bgfx/3rdparty/glslang/SPIRV/SpvBuilder.h

@@ -134,6 +134,9 @@ public:
     bool isSampledImage(Id resultId) const { return isSampledImageType(getTypeId(resultId)); }
 
     bool isBoolType(Id typeId)         const { return groupedTypes[OpTypeBool].size() > 0 && typeId == groupedTypes[OpTypeBool].back()->getResultId(); }
+    bool isIntType(Id typeId)          const { return getTypeClass(typeId) == OpTypeInt && module.getInstruction(typeId)->getImmediateOperand(1) != 0; }
+    bool isUintType(Id typeId)         const { return getTypeClass(typeId) == OpTypeInt && module.getInstruction(typeId)->getImmediateOperand(1) == 0; }
+    bool isFloatType(Id typeId)        const { return getTypeClass(typeId) == OpTypeFloat; }
     bool isPointerType(Id typeId)      const { return getTypeClass(typeId) == OpTypePointer; }
     bool isScalarType(Id typeId)       const { return getTypeClass(typeId) == OpTypeFloat  || getTypeClass(typeId) == OpTypeInt || getTypeClass(typeId) == OpTypeBool; }
     bool isVectorType(Id typeId)       const { return getTypeClass(typeId) == OpTypeVector; }
@@ -153,6 +156,13 @@ public:
     unsigned int getConstantScalar(Id resultId) const { return module.getInstruction(resultId)->getImmediateOperand(0); }
     StorageClass getStorageClass(Id resultId) const { return getTypeStorageClass(getTypeId(resultId)); }
 
+    int getScalarTypeWidth(Id typeId) const
+    {
+        Id scalarTypeId = getScalarTypeId(typeId);
+        assert(getTypeClass(scalarTypeId) == OpTypeInt || getTypeClass(scalarTypeId) == OpTypeFloat);
+        return module.getInstruction(scalarTypeId)->getImmediateOperand(0);
+    }
+
     int getTypeNumColumns(Id typeId) const
     {
         assert(isMatrixType(typeId));

3rdparty/bgfx/3rdparty/glslang/SPIRV/doc.cpp

@@ -68,9 +68,9 @@ namespace spv {
 // Also, the ceilings are declared next to these, to help keep them in sync.
 // Ceilings should be
 //  - one more than the maximum value an enumerant takes on, for non-mask enumerants
-//    (for non-sparse enums, this is the number of enumurants)
+//    (for non-sparse enums, this is the number of enumerants)
 //  - the number of bits consumed by the set of masks
-//    (for non-sparse mask enums, this is the number of enumurants)
+//    (for non-sparse mask enums, this is the number of enumerants)
 //
 
 const int SourceLanguageCeiling = 6; // HLSL todo: need official enumerant

3rdparty/bgfx/3rdparty/glslang/SPIRV/spirv.hpp

@@ -61,6 +61,7 @@ enum SourceLanguage {
     SourceLanguageGLSL = 2,
     SourceLanguageOpenCL_C = 3,
     SourceLanguageOpenCL_CPP = 4,
+    SourceLanguageHLSL = 5,
     SourceLanguageMax = 0x7fffffff,
 };
 
@@ -137,6 +138,7 @@ enum StorageClass {
     StorageClassPushConstant = 9,
     StorageClassAtomicCounter = 10,
     StorageClassImage = 11,
+    StorageClassStorageBuffer = 12,
     StorageClassMax = 0x7fffffff,
 };
 
@@ -616,12 +618,16 @@ enum Capability {
     CapabilitySubgroupBallotKHR = 4423,
     CapabilityDrawParameters = 4427,
     CapabilitySubgroupVoteKHR = 4431,
+    CapabilityStorageBuffer16BitAccess = 4433,
     CapabilityStorageUniformBufferBlock16 = 4433,
     CapabilityStorageUniform16 = 4434,
+    CapabilityUniformAndStorageBuffer16BitAccess = 4434,
     CapabilityStoragePushConstant16 = 4435,
     CapabilityStorageInputOutput16 = 4436,
     CapabilityDeviceGroup = 4437,
     CapabilityMultiView = 4439,
+    CapabilityVariablePointersStorageBuffer = 4441,
+    CapabilityVariablePointers = 4442,
     CapabilitySampleMaskOverrideCoverageNV = 5249,
     CapabilityGeometryShaderPassthroughNV = 5251,
     CapabilityShaderViewportIndexLayerNV = 5254,

3rdparty/bgfx/3rdparty/glslang/StandAlone/StandAlone.cpp

@@ -51,6 +51,8 @@
 #include <cctype>
 #include <cmath>
 #include <array>
+#include <memory>
+#include <thread>
 
 #include "../glslang/OSDependent/osinclude.h"
 
@@ -84,6 +86,7 @@ enum TOptions {
     EOptionFlattenUniformArrays = (1 << 20),
     EOptionNoStorageFormat      = (1 << 21),
     EOptionKeepUncalled         = (1 << 22),
+    EOptionHlslOffsets          = (1 << 23),
 };
 
 //
@@ -150,13 +153,6 @@ void ProcessConfigFile()
         delete[] config;
 }
 
-// thread-safe list of shaders to asynchronously grab and compile
-glslang::TWorklist Worklist;
-
-// array of unique places to leave the shader names and infologs for the asynchronous compiles
-glslang::TWorkItem** Work = 0;
-int NumWorkItems = 0;
-
 int Options = 0;
 const char* ExecutableName = nullptr;
 const char* binaryFileName = nullptr;
@@ -253,7 +249,7 @@ void ProcessBindingBase(int& argc, char**& argv, std::array<unsigned int, EShLan
 //
 // Does not return (it exits) if command-line is fatally flawed.
 //
-void ProcessArguments(int argc, char* argv[])
+void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItems, int argc, char* argv[])
 {
     baseSamplerBinding.fill(0);
     baseTextureBinding.fill(0);
@@ -262,10 +258,7 @@ void ProcessArguments(int argc, char* argv[])
     baseSsboBinding.fill(0);
 
     ExecutableName = argv[0];
-    NumWorkItems = argc;  // will include some empties where the '-' options were, but it doesn't matter, they'll be 0
+    workItems.reserve(argc);
-    Work = new glslang::TWorkItem*[NumWorkItems];
-    for (int w = 0; w < NumWorkItems; ++w)
-        Work[w] = 0;
 
     argc--;
     argv++;
@@ -319,8 +312,7 @@ void ProcessArguments(int argc, char* argv[])
                         } else
                             Error("no <C-variable-name> provided for --variable-name");
                         break;
-                    }
+                    } else if (lowerword == "source-entrypoint" || // synonyms
-                    else if (lowerword == "source-entrypoint" || // synonyms
                                lowerword == "sep") {
                         sourceEntryPointName = argv[1];
                         if (argc > 0) {
@@ -332,6 +324,8 @@ void ProcessArguments(int argc, char* argv[])
                     } else if (lowerword == "keep-uncalled" || // synonyms
                                lowerword == "ku") {
                         Options |= EOptionKeepUncalled;
+                    } else if (lowerword == "hlsl-offsets") {
+                        Options |= EOptionHlslOffsets;
                     } else {
                         usage();
                     }
@@ -420,9 +414,7 @@ void ProcessArguments(int argc, char* argv[])
                 Options |= EOptionSuppressInfolog;
                 break;
             case 't':
-                #ifdef _WIN32
                 Options |= EOptionMultiThreaded;
-                #endif
                 break;
             case 'v':
                 Options |= EOptionDumpVersions;
@@ -440,8 +432,7 @@ void ProcessArguments(int argc, char* argv[])
         } else {
             std::string name(argv[0]);
             if (! SetConfigFile(name)) {
-                Work[argc] = new glslang::TWorkItem(name);
+                workItems.push_back(std::unique_ptr<glslang::TWorkItem>(new glslang::TWorkItem(name)));
-                Worklist.add(Work[argc]);
             }
         }
     }
@@ -482,20 +473,20 @@ void SetMessageOptions(EShMessages& messages)
         messages = (EShMessages)(messages | EShMsgCascadingErrors);
     if (Options & EOptionKeepUncalled)
         messages = (EShMessages)(messages | EShMsgKeepUncalled);
+    if (Options & EOptionHlslOffsets)
+        messages = (EShMessages)(messages | EShMsgHlslOffsets);
 }
 
 //
 // Thread entry point, for non-linking asynchronous mode.
 //
-// Return 0 for failure, 1 for success.
+void CompileShaders(glslang::TWorklist& worklist)
-//
-unsigned int CompileShaders(void*)
 {
     glslang::TWorkItem* workItem;
-    while (Worklist.remove(workItem)) {
+    while (worklist.remove(workItem)) {
         ShHandle compiler = ShConstructCompiler(FindLanguage(workItem->name), Options);
         if (compiler == 0)
-            return 0;
+            return;
 
         CompileFile(workItem->name.c_str(), compiler);
 
@@ -504,8 +495,6 @@ unsigned int CompileShaders(void*)
 
         ShDestruct(compiler);
     }
-
-    return 0;
 }
 
 // Outputs the given string, but only if it is non-null and non-empty.
@@ -705,7 +694,7 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
 // performance and memory testing, the actual compile/link can be put in
 // a loop, independent of processing the work items and file IO.
 //
-void CompileAndLinkShaderFiles()
+void CompileAndLinkShaderFiles(glslang::TWorklist& Worklist)
 {
     std::vector<ShaderCompUnit> compUnits;
 
@@ -747,11 +736,19 @@ void CompileAndLinkShaderFiles()
 
 int C_DECL main(int argc, char* argv[])
 {
-    ProcessArguments(argc, argv);
+    // array of unique places to leave the shader names and infologs for the asynchronous compiles
+    std::vector<std::unique_ptr<glslang::TWorkItem>> workItems;
+    ProcessArguments(workItems, argc, argv);
+
+    glslang::TWorklist workList;
+    std::for_each(workItems.begin(), workItems.end(), [&workList](std::unique_ptr<glslang::TWorkItem>& item) {
+        assert(item);
+        workList.add(item.get());
+    });
 
     if (Options & EOptionDumpConfig) {
         printf("%s", glslang::GetDefaultTBuiltInResourceString().c_str());
-        if (Worklist.empty())
+        if (workList.empty())
             return ESuccess;
     }
 
@@ -766,11 +763,11 @@ int C_DECL main(int argc, char* argv[])
         printf("Khronos Tool ID %d\n", glslang::GetKhronosToolId());
         printf("GL_KHR_vulkan_glsl version %d\n", 100);
         printf("ARB_GL_gl_spirv version %d\n", 100);
-        if (Worklist.empty())
+        if (workList.empty())
             return ESuccess;
     }
 
-    if (Worklist.empty()) {
+    if (workList.empty()) {
         usage();
     }
 
@@ -784,47 +781,42 @@ int C_DECL main(int argc, char* argv[])
     if (Options & EOptionLinkProgram ||
         Options & EOptionOutputPreprocessed) {
         glslang::InitializeProcess();
-        CompileAndLinkShaderFiles();
+        CompileAndLinkShaderFiles(workList);
         glslang::FinalizeProcess();
-        for (int w = 0; w < NumWorkItems; ++w) {
-          if (Work[w]) {
-            delete Work[w];
-          }
-        }
     } else {
         ShInitialize();
 
-        bool printShaderNames = Worklist.size() > 1;
+        bool printShaderNames = workList.size() > 1;
 
-        if (Options & EOptionMultiThreaded) {
+        if (Options & EOptionMultiThreaded)
-            const int NumThreads = 16;
+        {
-            void* threads[NumThreads];
+            std::array<std::thread, 16> threads;
-            for (int t = 0; t < NumThreads; ++t) {
+            for (unsigned int t = 0; t < threads.size(); ++t)
-                threads[t] = glslang::OS_CreateThread(&CompileShaders);
+            {
-                if (! threads[t]) {
+                threads[t] = std::thread(CompileShaders, std::ref(workList));
+                if (threads[t].get_id() == std::thread::id())
+                {
                     printf("Failed to create thread\n");
                     return EFailThreadCreate;
                 }
             }
-            glslang::OS_WaitForAllThreads(threads, NumThreads);
+
+            std::for_each(threads.begin(), threads.end(), [](std::thread& t) { t.join(); });
         } else
-            CompileShaders(0);
+            CompileShaders(workList);
 
         // Print out all the resulting infologs
-        for (int w = 0; w < NumWorkItems; ++w) {
+        for (size_t w = 0; w < workItems.size(); ++w) {
-            if (Work[w]) {
+            if (workItems[w]) {
-                if (printShaderNames || Work[w]->results.size() > 0)
+                if (printShaderNames || workItems[w]->results.size() > 0)
-                    PutsIfNonEmpty(Work[w]->name.c_str());
+                    PutsIfNonEmpty(workItems[w]->name.c_str());
-                PutsIfNonEmpty(Work[w]->results.c_str());
+                PutsIfNonEmpty(workItems[w]->results.c_str());
-                delete Work[w];
             }
         }
 
         ShFinalize();
     }
 
-    delete[] Work;
-
     if (CompileFailed)
         return EFailCompile;
     if (LinkFailed)
@@ -1010,8 +1002,13 @@ void usage()
            "\n"
            "  --keep-uncalled                         don't eliminate uncalled functions when linking\n"
            "  --ku                                    synonym for --keep-uncalled\n"
-           "  --variable-name <name>                  Creates a C header file that contains a uint32_t array named <name> initialized with the shader binary code.\n"
+           "\n"
-           "  --vn <name>                             synonym for --variable-name <name>.\n"
+           "  --variable-name <name>                  Creates a C header file that contains a uint32_t array named <name>\n"
+           "                                          initialized with the shader binary code.\n"
+           "  --vn <name>                             synonym for --variable-name <name>\n"
+           "\n"
+           "  --hlsl-offsets                          Allow block offsets to follow HLSL rules instead of GLSL rules.\n"
+           "                                          Works independently of source language.\n"
            );
 
     exit(EFailUsage);

3rdparty/bgfx/3rdparty/glslang/StandAlone/Worklist.h

@@ -36,8 +36,9 @@
 #define WORKLIST_H_INCLUDED
 
 #include "../glslang/OSDependent/osinclude.h"
-#include <string>
 #include <list>
+#include <mutex>
+#include <string>
 
 namespace glslang {
 
@@ -58,24 +59,19 @@ namespace glslang {
 
         void add(TWorkItem* item)
         {
-            GetGlobalLock();
+            std::lock_guard<std::mutex> guard(mutex);
-
             worklist.push_back(item);
-
-            ReleaseGlobalLock();
         }
 
         bool remove(TWorkItem*& item)
         {
-            GetGlobalLock();
+            std::lock_guard<std::mutex> guard(mutex);
 
             if (worklist.empty())
                 return false;
             item = worklist.front();
             worklist.pop_front();
 
-            ReleaseGlobalLock();
-
             return true;
         }
 
@@ -90,6 +86,7 @@ namespace glslang {
         }
 
     protected:
+        std::mutex mutex;
         std::list<TWorkItem*> worklist;
     };
 

3rdparty/bgfx/3rdparty/glslang/Test/450.geom

@@ -8,7 +8,10 @@ out gl_PerVertex {
     float gl_CullDistance[3];
 };
 
+layout(triangles) in;
+
 void main()
 {
+    gl_in[3].gl_Position; // ERROR, out of range
     gl_CullDistance[2] = gl_in[1].gl_CullDistance[2];
 }

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/450.geom.out

@@ -1,72 +1,83 @@
 450.geom
 Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
+ERROR: 0:15: '[' :  array index out of range '3'
+ERROR: 0:15: 'gl_Position' : no such field in structure 
+ERROR: 2 compilation errors.  No code generated.
+
 
 Shader version: 450
 invocations = -1
 max_vertices = -1
-input primitive = none
+input primitive = triangles
 output primitive = none
-0:? Sequence
+ERROR: node is still EOpNull!
-0:11  Function Definition: main( ( global void)
+0:13  Function Definition: main( ( global void)
-0:11    Function Parameters: 
+0:13    Function Parameters: 
-0:13    Sequence
+0:15    Sequence
-0:13      move second child to first child ( temp float)
+0:15      direct index ( temp block{ in 3-element array of float CullDistance gl_CullDistance})
-0:13        direct index (layout( stream=0) temp float CullDistance)
+0:15        'gl_in' ( in 3-element array of block{ in 3-element array of float CullDistance gl_CullDistance})
-0:13          gl_CullDistance: direct index for structure (layout( stream=0) out 3-element array of float CullDistance)
+0:15        Constant:
-0:13            'anon@0' (layout( stream=0) out block{layout( stream=0) out 3-element array of float CullDistance gl_CullDistance})
+0:15          3 (const int)
-0:13            Constant:
+0:16      move second child to first child ( temp float)
-0:13              3 (const uint)
+0:16        direct index (layout( stream=0) temp float CullDistance)
-0:13          Constant:
+0:16          gl_CullDistance: direct index for structure (layout( stream=0) out 3-element array of float CullDistance)
-0:13            2 (const int)
+0:16            'anon@0' (layout( stream=0) out block{layout( stream=0) out 3-element array of float CullDistance gl_CullDistance})
-0:13        direct index ( temp float CullDistance)
+0:16            Constant:
-0:13          gl_CullDistance: direct index for structure ( in 3-element array of float CullDistance)
+0:16              3 (const uint)
-0:13            direct index ( temp block{ in 3-element array of float CullDistance gl_CullDistance})
+0:16          Constant:
-0:13              'gl_in' ( in implicitly-sized array of block{ in 3-element array of float CullDistance gl_CullDistance})
+0:16            2 (const int)
-0:13              Constant:
+0:16        direct index ( temp float CullDistance)
-0:13                1 (const int)
+0:16          gl_CullDistance: direct index for structure ( in 3-element array of float CullDistance)
-0:13            Constant:
+0:16            direct index ( temp block{ in 3-element array of float CullDistance gl_CullDistance})
-0:13              0 (const int)
+0:16              'gl_in' ( in 3-element array of block{ in 3-element array of float CullDistance gl_CullDistance})
-0:13          Constant:
+0:16              Constant:
-0:13            2 (const int)
+0:16                1 (const int)
+0:16            Constant:
+0:16              0 (const int)
+0:16          Constant:
+0:16            2 (const int)
 0:?   Linker Objects
-0:?     'gl_in' ( in implicitly-sized array of block{ in 3-element array of float CullDistance gl_CullDistance})
+0:?     'gl_in' ( in 3-element array of block{ in 3-element array of float CullDistance gl_CullDistance})
 0:?     'anon@0' (layout( stream=0) out block{layout( stream=0) out 3-element array of float CullDistance gl_CullDistance})
 
 
 Linked geometry stage:
 
-ERROR: Linking geometry stage: At least one shader must specify an input layout primitive
 ERROR: Linking geometry stage: At least one shader must specify an output layout primitive
 ERROR: Linking geometry stage: At least one shader must specify a layout(max_vertices = value)
 
 Shader version: 450
 invocations = 1
 max_vertices = -1
-input primitive = none
+input primitive = triangles
 output primitive = none
-0:? Sequence
+ERROR: node is still EOpNull!
-0:11  Function Definition: main( ( global void)
+0:13  Function Definition: main( ( global void)
-0:11    Function Parameters: 
+0:13    Function Parameters: 
-0:13    Sequence
+0:15    Sequence
-0:13      move second child to first child ( temp float)
+0:15      direct index ( temp block{ in 3-element array of float CullDistance gl_CullDistance})
-0:13        direct index (layout( stream=0) temp float CullDistance)
+0:15        'gl_in' ( in 3-element array of block{ in 3-element array of float CullDistance gl_CullDistance})
-0:13          gl_CullDistance: direct index for structure (layout( stream=0) out 3-element array of float CullDistance)
+0:15        Constant:
-0:13            'anon@0' (layout( stream=0) out block{layout( stream=0) out 3-element array of float CullDistance gl_CullDistance})
+0:15          3 (const int)
-0:13            Constant:
+0:16      move second child to first child ( temp float)
-0:13              3 (const uint)
+0:16        direct index (layout( stream=0) temp float CullDistance)
-0:13          Constant:
+0:16          gl_CullDistance: direct index for structure (layout( stream=0) out 3-element array of float CullDistance)
-0:13            2 (const int)
+0:16            'anon@0' (layout( stream=0) out block{layout( stream=0) out 3-element array of float CullDistance gl_CullDistance})
-0:13        direct index ( temp float CullDistance)
+0:16            Constant:
-0:13          gl_CullDistance: direct index for structure ( in 3-element array of float CullDistance)
+0:16              3 (const uint)
-0:13            direct index ( temp block{ in 3-element array of float CullDistance gl_CullDistance})
+0:16          Constant:
-0:13              'gl_in' ( in 2-element array of block{ in 3-element array of float CullDistance gl_CullDistance})
+0:16            2 (const int)
-0:13              Constant:
+0:16        direct index ( temp float CullDistance)
-0:13                1 (const int)
+0:16          gl_CullDistance: direct index for structure ( in 3-element array of float CullDistance)
-0:13            Constant:
+0:16            direct index ( temp block{ in 3-element array of float CullDistance gl_CullDistance})
-0:13              0 (const int)
+0:16              'gl_in' ( in 3-element array of block{ in 3-element array of float CullDistance gl_CullDistance})
-0:13          Constant:
+0:16              Constant:
-0:13            2 (const int)
+0:16                1 (const int)
+0:16            Constant:
+0:16              0 (const int)
+0:16          Constant:
+0:16            2 (const int)
 0:?   Linker Objects
-0:?     'gl_in' ( in 2-element array of block{ in 3-element array of float CullDistance gl_CullDistance})
+0:?     'gl_in' ( in 3-element array of block{ in 3-element array of float CullDistance gl_CullDistance})
 0:?     'anon@0' (layout( stream=0) out block{layout( stream=0) out 3-element array of float CullDistance gl_CullDistance})
 

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.amend.frag.out

@@ -1,5 +1,5 @@
 hlsl.amend.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Sequence
@@ -81,7 +81,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Sequence
@@ -168,6 +168,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "f1"
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "f1"
                               Name 6  "@f1("
                               Name 8  "f2("

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.array.flatten.frag.out

@@ -1,5 +1,5 @@
 hlsl.array.flatten.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:17  Function Definition: TestFn1( ( temp 4-component vector of float)
@@ -173,7 +173,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:17  Function Definition: TestFn1( ( temp 4-component vector of float)
@@ -353,6 +353,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 128
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 9  "TestFn1("
                               Name 22  "TestFn2(t11[3];p1[3];"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.array.frag.out

@@ -1,5 +1,5 @@
 hlsl.array.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:8  Function Definition: @PixelShaderFunction(i1;vf4[3]; ( temp 4-component vector of float)
@@ -76,7 +76,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:8  Function Definition: @PixelShaderFunction(i1;vf4[3]; ( temp 4-component vector of float)
@@ -158,6 +158,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 68 72 75
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 17  "@PixelShaderFunction(i1;vf4[3];"
                               Name 15  "i"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.array.implicit-size.frag.out

@@ -1,5 +1,5 @@
 hlsl.array.implicit-size.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Sequence
@@ -83,7 +83,7 @@ Linked fragment stage:
 
 WARNING: Linking fragment stage: Entry point not found
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Sequence
@@ -171,6 +171,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction"
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.array.multidim.frag.out

@@ -1,5 +1,5 @@
 hlsl.array.multidim.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:10  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -68,7 +68,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:10  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -142,6 +142,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 54
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.assoc.frag.out

@@ -1,5 +1,5 @@
 hlsl.assoc.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:8  Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vf4;vf4; ( temp 4-component vector of float)
@@ -67,7 +67,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:8  Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vf4;vf4; ( temp 4-component vector of float)
@@ -140,6 +140,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 31 34 37 40 43 46
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 15  "@PixelShaderFunction(vf4;vf4;vf4;vf4;vf4;"
                               Name 10  "a1"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.attribute.expression.comp.out

@@ -1,5 +1,5 @@
 hlsl.attribute.expression.comp
-Shader version: 450
+Shader version: 500
 local_size = (4, 6, 8)
 0:? Sequence
 0:9  Function Definition: @main( ( temp 4-component vector of float)
@@ -42,7 +42,7 @@ local_size = (4, 6, 8)
 Linked compute stage:
 
 
-Shader version: 450
+Shader version: 500
 local_size = (4, 6, 8)
 0:? Sequence
 0:9  Function Definition: @main( ( temp 4-component vector of float)
@@ -90,6 +90,7 @@ local_size = (4, 6, 8)
                               MemoryModel Logical GLSL450
                               EntryPoint GLCompute 4  "main" 37
                               ExecutionMode 4 LocalSize 4 6 8
+                              Source HLSL 500
                               Name 4  "main"
                               Name 9  "@main("
                               Name 13  "x"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.attribute.frag.out

@@ -1,5 +1,5 @@
 hlsl.attribute.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp void)
@@ -9,7 +9,7 @@ gl_FragCoord origin is upper left
 0:11      Test condition and select ( temp void)
 0:11        Condition
 0:11        Constant:
-0:11          0 (const int)
+0:11          false (const bool)
 0:11        true case is null
 0:2  Function Definition: PixelShaderFunction( ( temp void)
 0:2    Function Parameters: 
@@ -26,7 +26,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp void)
@@ -36,7 +36,7 @@ gl_FragCoord origin is upper left
 0:11      Test condition and select ( temp void)
 0:11        Condition
 0:11        Constant:
-0:11          0 (const int)
+0:11          false (const bool)
 0:11        true case is null
 0:2  Function Definition: PixelShaderFunction( ( temp void)
 0:2    Function Parameters: 
@@ -58,6 +58,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 19
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "@PixelShaderFunction(vf4;"
                               Name 10  "input"
@@ -71,8 +72,8 @@ gl_FragCoord origin is upper left
                7:             TypeVector 6(float) 4
                8:             TypePointer Function 7(fvec4)
                9:             TypeFunction 2 8(ptr)
-              13:             TypeInt 32 1
+              13:             TypeBool
-              14:     13(int) Constant 0
+              14:    13(bool) ConstantFalse
               18:             TypePointer Input 7(fvec4)
        19(input):     18(ptr) Variable Input
 4(PixelShaderFunction):           2 Function None 3

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.basic.comp.out

@@ -1,5 +1,5 @@
 hlsl.basic.comp
-Shader version: 450
+Shader version: 500
 local_size = (1, 1, 1)
 0:? Sequence
 0:4  Function Definition: @main(i1;i1; ( temp void)
@@ -31,7 +31,7 @@ local_size = (1, 1, 1)
 Linked compute stage:
 
 
-Shader version: 450
+Shader version: 500
 local_size = (1, 1, 1)
 0:? Sequence
 0:4  Function Definition: @main(i1;i1; ( temp void)
@@ -68,6 +68,7 @@ local_size = (1, 1, 1)
                               MemoryModel Logical GLSL450
                               EntryPoint GLCompute 4  "main" 18 21
                               ExecutionMode 4 LocalSize 1 1 1
+                              Source HLSL 500
                               Name 4  "main"
                               Name 11  "@main(i1;i1;"
                               Name 9  "dti"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.basic.geom.out

@@ -1,5 +1,5 @@
 hlsl.basic.geom
-Shader version: 450
+Shader version: 500
 invocations = -1
 max_vertices = 4
 input primitive = triangles
@@ -43,12 +43,12 @@ output primitive = line_strip
 0:20              0 (const int)
 0:22      Sequence
 0:22        move second child to first child ( temp structure{ temp float myfloat,  temp int something})
-0:22          'OutputStream' ( out structure{ temp float myfloat,  temp int something})
+0:22          'OutputStream' (layout( location=0) out structure{ temp float myfloat,  temp int something})
 0:22          'Vert' ( temp structure{ temp float myfloat,  temp int something})
 0:22        EmitVertex ( temp void)
 0:23      Sequence
 0:23        move second child to first child ( temp structure{ temp float myfloat,  temp int something})
-0:23          'OutputStream' ( out structure{ temp float myfloat,  temp int something})
+0:23          'OutputStream' (layout( location=0) out structure{ temp float myfloat,  temp int something})
 0:23          'Vert' ( temp structure{ temp float myfloat,  temp int something})
 0:23        EmitVertex ( temp void)
 0:24      EndPrimitive ( temp void)
@@ -60,20 +60,21 @@ output primitive = line_strip
 0:?         'VertexID' (layout( location=0) in 3-element array of uint)
 0:16      move second child to first child ( temp 3-element array of uint)
 0:?         'test' ( temp 3-element array of uint)
-0:?         'test' (layout( location=3) in 3-element array of uint)
+0:?         'test' (layout( location=1) in 3-element array of uint)
 0:16      Function Call: @main(u1[3];u1[3];struct-PSInput-f1-i11; ( temp void)
 0:?         'VertexID' ( temp 3-element array of uint)
 0:?         'test' ( temp 3-element array of uint)
 0:?         'OutputStream' ( temp structure{ temp float myfloat,  temp int something})
 0:?   Linker Objects
 0:?     'VertexID' (layout( location=0) in 3-element array of uint)
-0:?     'test' (layout( location=3) in 3-element array of uint)
+0:?     'test' (layout( location=1) in 3-element array of uint)
+0:?     'OutputStream' (layout( location=0) out structure{ temp float myfloat,  temp int something})
 
 
 Linked geometry stage:
 
 
-Shader version: 450
+Shader version: 500
 invocations = 1
 max_vertices = 4
 input primitive = triangles
@@ -117,12 +118,12 @@ output primitive = line_strip
 0:20              0 (const int)
 0:22      Sequence
 0:22        move second child to first child ( temp structure{ temp float myfloat,  temp int something})
-0:22          'OutputStream' ( out structure{ temp float myfloat,  temp int something})
+0:22          'OutputStream' (layout( location=0) out structure{ temp float myfloat,  temp int something})
 0:22          'Vert' ( temp structure{ temp float myfloat,  temp int something})
 0:22        EmitVertex ( temp void)
 0:23      Sequence
 0:23        move second child to first child ( temp structure{ temp float myfloat,  temp int something})
-0:23          'OutputStream' ( out structure{ temp float myfloat,  temp int something})
+0:23          'OutputStream' (layout( location=0) out structure{ temp float myfloat,  temp int something})
 0:23          'Vert' ( temp structure{ temp float myfloat,  temp int something})
 0:23        EmitVertex ( temp void)
 0:24      EndPrimitive ( temp void)
@@ -134,27 +135,29 @@ output primitive = line_strip
 0:?         'VertexID' (layout( location=0) in 3-element array of uint)
 0:16      move second child to first child ( temp 3-element array of uint)
 0:?         'test' ( temp 3-element array of uint)
-0:?         'test' (layout( location=3) in 3-element array of uint)
+0:?         'test' (layout( location=1) in 3-element array of uint)
 0:16      Function Call: @main(u1[3];u1[3];struct-PSInput-f1-i11; ( temp void)
 0:?         'VertexID' ( temp 3-element array of uint)
 0:?         'test' ( temp 3-element array of uint)
 0:?         'OutputStream' ( temp structure{ temp float myfloat,  temp int something})
 0:?   Linker Objects
 0:?     'VertexID' (layout( location=0) in 3-element array of uint)
-0:?     'test' (layout( location=3) in 3-element array of uint)
+0:?     'test' (layout( location=1) in 3-element array of uint)
+0:?     'OutputStream' (layout( location=0) out structure{ temp float myfloat,  temp int something})
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 57
+// Id's are bound by 60
 
                               Capability Geometry
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Geometry 4  "main" 45 48
+                              EntryPoint Geometry 4  "main" 42 47 50
                               ExecutionMode 4 Triangles
                               ExecutionMode 4 Invocations 1
                               ExecutionMode 4 OutputLineStrip
                               ExecutionMode 4 OutputVertices 4
+                              Source HLSL 500
                               Name 4  "main"
                               Name 12  "PSInput"
                               MemberName 12(PSInput) 0  "myfloat"
@@ -164,16 +167,18 @@ output primitive = line_strip
                               Name 16  "test"
                               Name 17  "OutputStream"
                               Name 20  "Vert"
-                              Name 43  "VertexID"
+                              Name 42  "OutputStream"
                               Name 45  "VertexID"
-                              Name 47  "test"
+                              Name 47  "VertexID"
-                              Name 48  "test"
+                              Name 49  "test"
-                              Name 50  "OutputStream"
+                              Name 50  "test"
-                              Name 51  "param"
+                              Name 52  "OutputStream"
                               Name 53  "param"
                               Name 55  "param"
-                              Decorate 45(VertexID) Location 0
+                              Name 57  "param"
-                              Decorate 48(test) Location 3
+                              Decorate 42(OutputStream) Location 0
+                              Decorate 47(VertexID) Location 0
+                              Decorate 50(test) Location 1
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
@@ -191,26 +196,30 @@ output primitive = line_strip
               29:     11(int) Constant 2
               34:             TypePointer Function 10(float)
               39:             TypePointer Function 11(int)
-              44:             TypePointer Input 8
+              41:             TypePointer Output 12(PSInput)
-    45(VertexID):     44(ptr) Variable Input
+42(OutputStream):     41(ptr) Variable Output
-        48(test):     44(ptr) Variable Input
+              46:             TypePointer Input 8
+    47(VertexID):     46(ptr) Variable Input
+        50(test):     46(ptr) Variable Input
          4(main):           2 Function None 3
                5:             Label
-    43(VertexID):      9(ptr) Variable Function
+    45(VertexID):      9(ptr) Variable Function
-        47(test):      9(ptr) Variable Function
+        49(test):      9(ptr) Variable Function
-50(OutputStream):     13(ptr) Variable Function
+52(OutputStream):     13(ptr) Variable Function
-       51(param):      9(ptr) Variable Function
        53(param):      9(ptr) Variable Function
-       55(param):     13(ptr) Variable Function
+       55(param):      9(ptr) Variable Function
-              46:           8 Load 45(VertexID)
+       57(param):     13(ptr) Variable Function
-                              Store 43(VertexID) 46
+              48:           8 Load 47(VertexID)
-              49:           8 Load 48(test)
+                              Store 45(VertexID) 48
-                              Store 47(test) 49
+              51:           8 Load 50(test)
-              52:           8 Load 43(VertexID)
+                              Store 49(test) 51
-                              Store 51(param) 52
+              54:           8 Load 45(VertexID)
-              54:           8 Load 47(test)
                               Store 53(param) 54
-              56:           2 FunctionCall 18(@main(u1[3];u1[3];struct-PSInput-f1-i11;) 51(param) 53(param) 55(param)
+              56:           8 Load 49(test)
+                              Store 55(param) 56
+              58:           2 FunctionCall 18(@main(u1[3];u1[3];struct-PSInput-f1-i11;) 53(param) 55(param) 57(param)
+              59: 12(PSInput) Load 57(param)
+                              Store 52(OutputStream) 59
                               Return
                               FunctionEnd
 18(@main(u1[3];u1[3];struct-PSInput-f1-i11;):           2 Function None 14
@@ -235,11 +244,11 @@ output primitive = line_strip
               38:     11(int) Bitcast 37
               40:     39(ptr) AccessChain 20(Vert) 25
                               Store 40 38
-              41: 12(PSInput) Load 20(Vert)
+              43: 12(PSInput) Load 20(Vert)
-                              Store 17(OutputStream) 41
+                              Store 42(OutputStream) 43
                               EmitVertex
-              42: 12(PSInput) Load 20(Vert)
+              44: 12(PSInput) Load 20(Vert)
-                              Store 17(OutputStream) 42
+                              Store 42(OutputStream) 44
                               EmitVertex
                               EndPrimitive
                               Return

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.buffer.frag.out

@@ -1,5 +1,5 @@
 hlsl.buffer.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:30  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -50,7 +50,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:30  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -106,6 +106,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 46 49
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "@PixelShaderFunction(vf4;"
                               Name 10  "input"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.calculatelod.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.calculatelod.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -179,7 +179,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -367,6 +367,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 140 144
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

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

@@ -11,7 +11,7 @@ ERROR: 0:38: '' : unimplemented: CalculateLevelOfDetailUnclamped
 ERROR: 9 compilation errors.  No code generated.
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -191,7 +191,7 @@ ERROR: node is still EOpNull!
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.cast.frag.out

@@ -1,5 +1,5 @@
 hlsl.cast.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -37,7 +37,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -80,6 +80,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 32 35
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "@PixelShaderFunction(vf4;"
                               Name 10  "input"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.comparison.vec.frag.out

@@ -1,5 +1,5 @@
 hlsl.comparison.vec.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:4  Function Definition: Bug1(vf4; ( temp void)
@@ -132,7 +132,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:4  Function Definition: Bug1(vf4; ( temp void)
@@ -270,6 +270,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 90
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 11  "Bug1(vf4;"
                               Name 10  "a"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.conditional.frag.out

@@ -1,5 +1,5 @@
 hlsl.conditional.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -55,6 +55,7 @@ gl_FragCoord origin is upper left
 0:12            'a' ( temp int)
 0:12            Test condition and select ( temp int)
 0:12              Condition
+0:12              Convert int to bool ( temp bool)
 0:12                'b' ( temp int)
 0:12              true case
 0:12              move second child to first child ( temp int)
@@ -67,6 +68,7 @@ gl_FragCoord origin is upper left
 0:12          'b' ( temp int)
 0:12          Test condition and select ( temp int)
 0:12            Condition
+0:12            Convert int to bool ( temp bool)
 0:12              'a' ( temp int)
 0:12            true case
 0:12            move second child to first child ( temp int)
@@ -123,7 +125,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -179,6 +181,7 @@ gl_FragCoord origin is upper left
 0:12            'a' ( temp int)
 0:12            Test condition and select ( temp int)
 0:12              Condition
+0:12              Convert int to bool ( temp bool)
 0:12                'b' ( temp int)
 0:12              true case
 0:12              move second child to first child ( temp int)
@@ -191,6 +194,7 @@ gl_FragCoord origin is upper left
 0:12          'b' ( temp int)
 0:12          Test condition and select ( temp int)
 0:12            Condition
+0:12            Convert int to bool ( temp bool)
 0:12              'a' ( temp int)
 0:12            true case
 0:12            move second child to first child ( temp int)
@@ -245,13 +249,14 @@ gl_FragCoord origin is upper left
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 100
+// Id's are bound by 102
 
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "PixelShaderFunction" 93 96
+                              EntryPoint Fragment 4  "PixelShaderFunction" 95 98
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "@PixelShaderFunction(vf4;"
                               Name 10  "input"
@@ -261,13 +266,13 @@ gl_FragCoord origin is upper left
                               Name 21  "d"
                               Name 22  "ret"
                               Name 42  "e"
-                              Name 59  "f"
+                              Name 64  "f"
-                              Name 91  "input"
                               Name 93  "input"
-                              Name 96  "@entryPointOutput"
+                              Name 95  "input"
-                              Name 97  "param"
+                              Name 98  "@entryPointOutput"
-                              Decorate 93(input) Location 0
+                              Name 99  "param"
-                              Decorate 96(@entryPointOutput) Location 0
+                              Decorate 95(input) Location 0
+                              Decorate 98(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -279,27 +284,27 @@ gl_FragCoord origin is upper left
               16:     13(int) Constant 5
               18:     13(int) Constant 6
               20:     13(int) Constant 7
-              49:     13(int) Constant 10
+              45:             TypeBool
-              57:     13(int) Constant 11
+              46:             TypeInt 32 0
-              61:             TypeInt 32 0
+              47:     46(int) Constant 0
-              62:     61(int) Constant 0
+              53:     13(int) Constant 10
-              63:             TypePointer Function 6(float)
+              62:     13(int) Constant 11
-              66:     61(int) Constant 1
+              66:             TypePointer Function 6(float)
-              69:             TypeBool
+              69:     46(int) Constant 1
-              92:             TypePointer Input 7(fvec4)
+              94:             TypePointer Input 7(fvec4)
-       93(input):     92(ptr) Variable Input
+       95(input):     94(ptr) Variable Input
-              95:             TypePointer Output 7(fvec4)
+              97:             TypePointer Output 7(fvec4)
-96(@entryPointOutput):     95(ptr) Variable Output
+98(@entryPointOutput):     97(ptr) Variable Output
 4(PixelShaderFunction):           2 Function None 3
                5:             Label
-       91(input):      8(ptr) Variable Function
+       93(input):      8(ptr) Variable Function
-       97(param):      8(ptr) Variable Function
+       99(param):      8(ptr) Variable Function
-              94:    7(fvec4) Load 93(input)
+              96:    7(fvec4) Load 95(input)
-                              Store 91(input) 94
+                              Store 93(input) 96
-              98:    7(fvec4) Load 91(input)
+             100:    7(fvec4) Load 93(input)
-                              Store 97(param) 98
+                              Store 99(param) 100
-              99:    7(fvec4) FunctionCall 11(@PixelShaderFunction(vf4;) 97(param)
+             101:    7(fvec4) FunctionCall 11(@PixelShaderFunction(vf4;) 99(param)
-                              Store 96(@entryPointOutput) 99
+                              Store 98(@entryPointOutput) 101
                               Return
                               FunctionEnd
 11(@PixelShaderFunction(vf4;):    7(fvec4) Function None 9
@@ -312,9 +317,9 @@ gl_FragCoord origin is upper left
          22(ret):      8(ptr) Variable Function
            42(e):     14(ptr) Variable Function
               43:     14(ptr) Variable Function
-              51:     14(ptr) Variable Function
+              55:     14(ptr) Variable Function
-           59(f):      8(ptr) Variable Function
+           64(f):      8(ptr) Variable Function
-              60:      8(ptr) Variable Function
+              65:      8(ptr) Variable Function
                               Store 15(a) 16
                               Store 17(b) 18
                               Store 19(c) 20
@@ -340,63 +345,65 @@ gl_FragCoord origin is upper left
               41:    7(fvec4) FAdd 36 40
                               Store 22(ret) 41
               44:     13(int) Load 17(b)
-                              SelectionMerge 46 None
+              48:    45(bool) INotEqual 44 47
-                              BranchConditional 44 45 48
+                              SelectionMerge 50 None
-              45:               Label
+                              BranchConditional 48 49 52
-              47:     13(int)   Load 21(d)
+              49:               Label
-                                Store 19(c) 47
+              51:     13(int)   Load 21(d)
-                                Store 43 47
+                                Store 19(c) 51
-                                Branch 46
+                                Store 43 51
-              48:               Label
+                                Branch 50
-                                Store 43 49
+              52:               Label
-                                Branch 46
+                                Store 43 53
-              46:             Label
+                                Branch 50
-              50:     13(int) Load 43
+              50:             Label
-                              Store 15(a) 50
+              54:     13(int) Load 43
-                              Store 42(e) 50
+                              Store 15(a) 54
-              52:     13(int) Load 15(a)
+                              Store 42(e) 54
-                              SelectionMerge 54 None
+              56:     13(int) Load 15(a)
-                              BranchConditional 52 53 56
+              57:    45(bool) INotEqual 56 47
-              53:               Label
+                              SelectionMerge 59 None
-              55:     13(int)   Load 19(c)
+                              BranchConditional 57 58 61
-                                Store 21(d) 55
+              58:               Label
-                                Store 51 55
+              60:     13(int)   Load 19(c)
-                                Branch 54
+                                Store 21(d) 60
-              56:               Label
+                                Store 55 60
-                                Store 51 57
+                                Branch 59
-                                Branch 54
+              61:               Label
-              54:             Label
+                                Store 55 62
-              58:     13(int) Load 51
+                                Branch 59
-                              Store 17(b) 58
+              59:             Label
-              64:     63(ptr) AccessChain 22(ret) 62
+              63:     13(int) Load 55
-              65:    6(float) Load 64
+                              Store 17(b) 63
-              67:     63(ptr) AccessChain 10(input) 66
+              67:     66(ptr) AccessChain 22(ret) 47
               68:    6(float) Load 67
-              70:    69(bool) FOrdLessThan 65 68
+              70:     66(ptr) AccessChain 10(input) 69
-                              SelectionMerge 72 None
+              71:    6(float) Load 70
-                              BranchConditional 70 71 77
+              72:    45(bool) FOrdLessThan 68 71
-              71:               Label
+                              SelectionMerge 74 None
-              73:     13(int)   Load 19(c)
+                              BranchConditional 72 73 79
-              74:    6(float)   ConvertSToF 73
+              73:               Label
-              75:    7(fvec4)   Load 10(input)
+              75:     13(int)   Load 19(c)
-              76:    7(fvec4)   VectorTimesScalar 75 74
+              76:    6(float)   ConvertSToF 75
-                                Store 60 76
+              77:    7(fvec4)   Load 10(input)
-                                Branch 72
+              78:    7(fvec4)   VectorTimesScalar 77 76
-              77:               Label
+                                Store 65 78
-              78:     13(int)   Load 21(d)
+                                Branch 74
-              79:    6(float)   ConvertSToF 78
+              79:               Label
-              80:    7(fvec4)   Load 10(input)
+              80:     13(int)   Load 21(d)
-              81:    7(fvec4)   VectorTimesScalar 80 79
+              81:    6(float)   ConvertSToF 80
-                                Store 60 81
+              82:    7(fvec4)   Load 10(input)
-                                Branch 72
+              83:    7(fvec4)   VectorTimesScalar 82 81
-              72:             Label
+                                Store 65 83
-              82:    7(fvec4) Load 60
+                                Branch 74
-                              Store 59(f) 82
+              74:             Label
-              83:     13(int) Load 42(e)
+              84:    7(fvec4) Load 65
-              84:    6(float) ConvertSToF 83
+                              Store 64(f) 84
-              85:    7(fvec4) Load 22(ret)
+              85:     13(int) Load 42(e)
-              86:    7(fvec4) VectorTimesScalar 85 84
+              86:    6(float) ConvertSToF 85
-              87:    7(fvec4) Load 59(f)
+              87:    7(fvec4) Load 22(ret)
-              88:    7(fvec4) FAdd 86 87
+              88:    7(fvec4) VectorTimesScalar 87 86
-                              ReturnValue 88
+              89:    7(fvec4) Load 64(f)
+              90:    7(fvec4) FAdd 88 89
+                              ReturnValue 90
                               FunctionEnd

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.constructexpr.frag.out

@@ -1,5 +1,5 @@
 hlsl.constructexpr.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:4  Function Definition: @main( ( temp structure{ temp 4-component vector of float color})
@@ -53,7 +53,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:4  Function Definition: @main( ( temp structure{ temp 4-component vector of float color})
@@ -112,6 +112,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 37
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.deadFunctionMissingBody.vert.out

@@ -7,6 +7,7 @@ hlsl.deadFunctionMissingBody.vert
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Vertex 4  "main" 16
+                              Source HLSL 500
                               Name 4  "main"
                               Name 9  "@main("
                               Name 16  "@entryPointOutput"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.depthGreater.frag.out

@@ -1,5 +1,5 @@
 hlsl.depthGreater.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 using depth_greater
 0:? Sequence
@@ -26,7 +26,7 @@ using depth_greater
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 using depth_greater
 0:? Sequence
@@ -59,6 +59,7 @@ using depth_greater
                               EntryPoint Fragment 4  "PixelShaderFunction" 18
                               ExecutionMode 4 OriginUpperLeft
                               ExecutionMode 4 DepthGreater
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 10  "@PixelShaderFunction(f1;"
                               Name 9  "depth"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.depthLess.frag.out

@@ -1,5 +1,5 @@
 hlsl.depthLess.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 using depth_less
 0:? Sequence
@@ -22,7 +22,7 @@ using depth_less
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 using depth_less
 0:? Sequence
@@ -51,6 +51,7 @@ using depth_less
                               EntryPoint Fragment 4  "PixelShaderFunction" 14
                               ExecutionMode 4 OriginUpperLeft
                               ExecutionMode 4 DepthLess
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 8  "@PixelShaderFunction("
                               Name 14  "@entryPointOutput"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.discard.frag.out

@@ -1,5 +1,5 @@
 hlsl.discard.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: foo(f1; ( temp void)
@@ -25,6 +25,7 @@ gl_FragCoord origin is upper left
 0:9            2 (const int)
 0:10      Test condition and select ( temp void)
 0:10        Condition
+0:10        Convert float to bool ( temp bool)
 0:10          direct index ( temp float)
 0:10            'input' ( in 4-component vector of float)
 0:10            Constant:
@@ -54,7 +55,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: foo(f1; ( temp void)
@@ -80,6 +81,7 @@ gl_FragCoord origin is upper left
 0:9            2 (const int)
 0:10      Test condition and select ( temp void)
 0:10        Condition
+0:10        Convert float to bool ( temp bool)
 0:10          direct index ( temp float)
 0:10            'input' ( in 4-component vector of float)
 0:10            Constant:
@@ -107,24 +109,25 @@ gl_FragCoord origin is upper left
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 48
+// Id's are bound by 50
 
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "PixelShaderFunction" 43
+                              EntryPoint Fragment 4  "PixelShaderFunction" 45
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 10  "foo(f1;"
                               Name 9  "f"
                               Name 16  "@PixelShaderFunction(vf4;"
                               Name 15  "input"
                               Name 25  "param"
-                              Name 37  "f"
+                              Name 39  "f"
-                              Name 41  "input"
                               Name 43  "input"
-                              Name 45  "param"
+                              Name 45  "input"
-                              Decorate 43(input) Location 0
+                              Name 47  "param"
+                              Decorate 45(input) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -138,17 +141,18 @@ gl_FragCoord origin is upper left
               26:             TypeInt 32 0
               27:     26(int) Constant 2
               31:     26(int) Constant 0
-              42:             TypePointer Input 12(fvec4)
+              34:    6(float) Constant 0
-       43(input):     42(ptr) Variable Input
+              44:             TypePointer Input 12(fvec4)
+       45(input):     44(ptr) Variable Input
 4(PixelShaderFunction):           2 Function None 3
                5:             Label
-       41(input):     13(ptr) Variable Function
+       43(input):     13(ptr) Variable Function
-       45(param):     13(ptr) Variable Function
+       47(param):     13(ptr) Variable Function
-              44:   12(fvec4) Load 43(input)
+              46:   12(fvec4) Load 45(input)
-                              Store 41(input) 44
+                              Store 43(input) 46
-              46:   12(fvec4) Load 41(input)
+              48:   12(fvec4) Load 43(input)
-                              Store 45(param) 46
+                              Store 47(param) 48
-              47:           2 FunctionCall 16(@PixelShaderFunction(vf4;) 45(param)
+              49:           2 FunctionCall 16(@PixelShaderFunction(vf4;) 47(param)
                               Return
                               FunctionEnd
      10(foo(f1;):           2 Function None 8
@@ -167,20 +171,21 @@ gl_FragCoord origin is upper left
        15(input):     13(ptr) FunctionParameter
               17:             Label
        25(param):      7(ptr) Variable Function
-           37(f):      7(ptr) Variable Function
+           39(f):      7(ptr) Variable Function
               28:      7(ptr) AccessChain 15(input) 27
               29:    6(float) Load 28
                               Store 25(param) 29
               30:           2 FunctionCall 10(foo(f1;) 25(param)
               32:      7(ptr) AccessChain 15(input) 31
               33:    6(float) Load 32
-                              SelectionMerge 35 None
+              35:    20(bool) FOrdNotEqual 33 34
-                              BranchConditional 33 34 35
+                              SelectionMerge 37 None
-              34:               Label
+                              BranchConditional 35 36 37
+              36:               Label
                                 Kill
-              35:             Label
+              37:             Label
-              38:      7(ptr) AccessChain 15(input) 31
+              40:      7(ptr) AccessChain 15(input) 31
-              39:    6(float) Load 38
+              41:    6(float) Load 40
-                              Store 37(f) 39
+                              Store 39(f) 41
                               Kill
                               FunctionEnd

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.doLoop.frag.out

@@ -1,5 +1,5 @@
 hlsl.doLoop.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -43,7 +43,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -92,6 +92,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 37 40
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "@PixelShaderFunction(vf4;"
                               Name 10  "input"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.emptystructreturn.frag.out

@@ -1,5 +1,5 @@
 hlsl.emptystructreturn.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:10  Function Definition: @main(struct-ps_in1; ( temp structure{})
@@ -26,7 +26,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:10  Function Definition: @main(struct-ps_in1; ( temp structure{})
@@ -58,6 +58,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 20 23
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 6  "ps_in"
                               Name 8  "ps_out"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.emptystructreturn.vert.out

@@ -1,5 +1,5 @@
 hlsl.emptystructreturn.vert
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:10  Function Definition: @main(struct-vs_in1; ( temp structure{})
 0:10    Function Parameters: 
@@ -25,7 +25,7 @@ Shader version: 450
 Linked vertex stage:
 
 
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:10  Function Definition: @main(struct-vs_in1; ( temp structure{})
 0:10    Function Parameters: 
@@ -55,6 +55,7 @@ Shader version: 450
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Vertex 4  "main" 20 23
+                              Source HLSL 500
                               Name 4  "main"
                               Name 6  "vs_in"
                               Name 8  "vs_out"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.entry-in.frag.out

@@ -1,5 +1,5 @@
 hlsl.entry-in.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:8  Function Definition: fun(struct-InParam-vf2-vf4-vi21; ( temp float)
@@ -89,7 +89,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:8  Function Definition: fun(struct-InParam-vf2-vf4-vi21; ( temp float)
@@ -184,6 +184,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 56 63 73
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "InParam"
                               MemberName 11(InParam) 0  "v"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.entry-out.frag.out

@@ -1,5 +1,5 @@
 hlsl.entry-out.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:7  Function Definition: fun(struct-OutParam-vf2-vi21; ( temp void)
@@ -123,7 +123,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:7  Function Definition: fun(struct-OutParam-vf2-vi21; ( temp void)
@@ -252,6 +252,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 57 60 73 76 80 83 86
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 10  "OutParam"
                               MemberName 10(OutParam) 0  "v"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.entry.rename.frag.out

@@ -1,5 +1,5 @@
 hlsl.entry.rename.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:7  Function Definition: not_the_entry_point( ( temp void)
@@ -37,7 +37,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:7  Function Definition: not_the_entry_point( ( temp void)
@@ -80,6 +80,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main_in_spv" 26
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main_in_spv"
                               Name 6  "not_the_entry_point("
                               Name 10  "PS_OUTPUT"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.flatten.return.frag.out

@@ -1,5 +1,5 @@
 hlsl.flatten.return.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:11  Function Definition: Func1( ( temp structure{ temp 4-component vector of float color,  temp float other_struct_member1,  temp float other_struct_member2,  temp float other_struct_member3})
@@ -60,7 +60,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:11  Function Definition: Func1( ( temp structure{ temp 4-component vector of float color,  temp float other_struct_member1,  temp float other_struct_member2,  temp float other_struct_member3})
@@ -126,6 +126,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 29 36 41 45
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.float1.frag.out

@@ -1,5 +1,5 @@
 hlsl.float1.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:1  Sequence
@@ -34,7 +34,7 @@ Linked fragment stage:
 
 WARNING: Linking fragment stage: Entry point not found
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:1  Sequence
@@ -73,6 +73,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction"
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "ShaderFunction(vf1;f1;"
                               Name 9  "inFloat1"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.float4.frag.out

@@ -2,7 +2,7 @@ hlsl.float4.frag
 WARNING: 0:5: 'register' : ignoring shader_profile 
 WARNING: 0:6: 'register' : ignoring shader_profile 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:9  Function Definition: ShaderFunction(vf4; ( temp 4-component vector of float)
@@ -24,7 +24,7 @@ Linked fragment stage:
 
 WARNING: Linking fragment stage: Entry point not found
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:9  Function Definition: ShaderFunction(vf4; ( temp 4-component vector of float)
@@ -50,6 +50,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction"
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "ShaderFunction(vf4;"
                               Name 10  "input"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.forLoop.frag.out

@@ -1,5 +1,5 @@
 hlsl.forLoop.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -128,7 +128,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -262,6 +262,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 117 120
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "@PixelShaderFunction(vf4;"
                               Name 10  "input"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gather.array.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gather.array.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -131,7 +131,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -270,6 +270,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 107 111
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gather.basic.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gather.basic.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:29  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -129,7 +129,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:29  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -265,6 +265,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 108 112
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gather.basic.dx10.vert.out

@@ -1,5 +1,5 @@
 hlsl.gather.basic.dx10.vert
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:28  Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos})
 0:28    Function Parameters: 
@@ -111,7 +111,7 @@ Shader version: 450
 Linked vertex stage:
 
 
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:28  Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos})
 0:28    Function Parameters: 
@@ -228,6 +228,7 @@ Shader version: 450
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Vertex 4  "main" 103 128
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "VS_OUTPUT"
                               MemberName 8(VS_OUTPUT) 0  "Pos"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gather.offset.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gather.offset.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:28  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -104,7 +104,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:28  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -215,6 +215,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 79 83
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gather.offsetarray.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:20  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -101,7 +101,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:20  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -209,6 +209,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 80 84
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gatherRGBA.array.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:28  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -375,7 +375,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:28  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -758,6 +758,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 238 242
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gatherRGBA.basic.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:34  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -379,7 +379,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:34  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -765,6 +765,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 238 242
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gatherRGBA.offset.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:39  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -631,7 +631,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:39  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -1270,6 +1270,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 363 367
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gatherRGBA.offsetarray.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:33  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -627,7 +627,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:33  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -1263,6 +1263,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 363 367
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.gathercmpRGBA.offset.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:38  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -180,7 +180,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:38  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -367,6 +367,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 111 115
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.getdimensions.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.getdimensions.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:46  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -1159,7 +1159,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:46  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -2328,6 +2328,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 540 544
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.getdimensions.dx10.vert.out

@@ -1,5 +1,5 @@
 hlsl.getdimensions.dx10.vert
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:11  Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos})
 0:11    Function Parameters: 
@@ -59,7 +59,7 @@ Shader version: 450
 Linked vertex stage:
 
 
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:11  Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos})
 0:11    Function Parameters: 
@@ -125,6 +125,7 @@ Shader version: 450
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Vertex 4  "main" 42 50
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "VS_OUTPUT"
                               MemberName 8(VS_OUTPUT) 0  "Pos"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.getdimensions.rw.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:44  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -359,7 +359,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:44  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -727,6 +727,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 216 220
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.getsampleposition.dx10.frag.out

@@ -4,7 +4,7 @@ ERROR: 0:17: '' : unimplemented: GetSamplePosition
 ERROR: 2 compilation errors.  No code generated.
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
 0:13  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -75,7 +75,7 @@ ERROR: node is still EOpNull!
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
 0:13  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.hull.1.tesc.out

@@ -1,6 +1,7 @@
 hlsl.hull.1.tesc
-Shader version: 450
+Shader version: 500
 vertices = 4
+vertex spacing = equal_spacing
 0:? Sequence
 0:26  Function Definition: @main(struct-VS_OUT-vf31[4];u1; ( temp structure{ temp 3-component vector of float cpoint})
 0:26    Function Parameters: 
@@ -31,7 +32,9 @@ vertices = 4
 0:?         'm_cpid' ( temp uint)
 0:?         'm_cpid' ( in uint InvocationID)
 0:26      move second child to first child ( temp structure{ temp 3-component vector of float cpoint})
-0:?         '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:26        indirect index ( temp structure{ temp 3-component vector of float cpoint})
+0:?           '@entryPointOutput' (layout( location=0) out 4-element array of structure{ temp 3-component vector of float cpoint})
+0:?           'm_cpid' ( in uint InvocationID)
 0:26        Function Call: @main(struct-VS_OUT-vf31[4];u1; ( temp structure{ temp 3-component vector of float cpoint})
 0:?           'ip' ( temp 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?           'm_cpid' ( temp uint)
@@ -50,8 +53,8 @@ vertices = 4
 0:?               'pid' ( in uint PrimitiveID)
 0:?           Sequence
 0:?             move second child to first child ( temp float)
-0:?               direct index ( out float TessLevelOuter)
+0:?               direct index ( patch out float TessLevelOuter)
-0:?                 '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?                 '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 0:?                 Constant:
 0:?                   0 (const int)
 0:?               direct index ( temp float)
@@ -62,8 +65,8 @@ vertices = 4
 0:?                 Constant:
 0:?                   0 (const int)
 0:?             move second child to first child ( temp float)
-0:?               direct index ( out float TessLevelOuter)
+0:?               direct index ( patch out float TessLevelOuter)
-0:?                 '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?                 '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 0:?                 Constant:
 0:?                   1 (const int)
 0:?               direct index ( temp float)
@@ -100,18 +103,20 @@ vertices = 4
 0:38      Branch: Return with expression
 0:38        'output' ( temp structure{ temp 2-element array of float edges})
 0:?   Linker Objects
-0:?     '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:?     '@entryPointOutput' (layout( location=0) out 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'ip' (layout( location=0) in 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'm_cpid' ( in uint InvocationID)
 0:?     'pid' ( in uint PrimitiveID)
-0:?     '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?     '@patchConstantOutput' (layout( location=1) patch out structure{})
+0:?     '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 
 
 Linked tessellation control stage:
 
 
-Shader version: 450
+Shader version: 500
 vertices = 4
+vertex spacing = equal_spacing
 0:? Sequence
 0:26  Function Definition: @main(struct-VS_OUT-vf31[4];u1; ( temp structure{ temp 3-component vector of float cpoint})
 0:26    Function Parameters: 
@@ -142,7 +147,9 @@ vertices = 4
 0:?         'm_cpid' ( temp uint)
 0:?         'm_cpid' ( in uint InvocationID)
 0:26      move second child to first child ( temp structure{ temp 3-component vector of float cpoint})
-0:?         '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:26        indirect index ( temp structure{ temp 3-component vector of float cpoint})
+0:?           '@entryPointOutput' (layout( location=0) out 4-element array of structure{ temp 3-component vector of float cpoint})
+0:?           'm_cpid' ( in uint InvocationID)
 0:26        Function Call: @main(struct-VS_OUT-vf31[4];u1; ( temp structure{ temp 3-component vector of float cpoint})
 0:?           'ip' ( temp 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?           'm_cpid' ( temp uint)
@@ -161,8 +168,8 @@ vertices = 4
 0:?               'pid' ( in uint PrimitiveID)
 0:?           Sequence
 0:?             move second child to first child ( temp float)
-0:?               direct index ( out float TessLevelOuter)
+0:?               direct index ( patch out float TessLevelOuter)
-0:?                 '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?                 '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 0:?                 Constant:
 0:?                   0 (const int)
 0:?               direct index ( temp float)
@@ -173,8 +180,8 @@ vertices = 4
 0:?                 Constant:
 0:?                   0 (const int)
 0:?             move second child to first child ( temp float)
-0:?               direct index ( out float TessLevelOuter)
+0:?               direct index ( patch out float TessLevelOuter)
-0:?                 '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?                 '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 0:?                 Constant:
 0:?                   1 (const int)
 0:?               direct index ( temp float)
@@ -211,21 +218,25 @@ vertices = 4
 0:38      Branch: Return with expression
 0:38        'output' ( temp structure{ temp 2-element array of float edges})
 0:?   Linker Objects
-0:?     '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:?     '@entryPointOutput' (layout( location=0) out 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'ip' (layout( location=0) in 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'm_cpid' ( in uint InvocationID)
 0:?     'pid' ( in uint PrimitiveID)
-0:?     '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?     '@patchConstantOutput' (layout( location=1) patch out structure{})
+0:?     '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 85
+// Id's are bound by 93
 
                               Capability Tessellation
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint TessellationControl 4  "main" 40 44 47 62 67
+                              EntryPoint TessellationControl 4  "main" 40 44 48 66 72 92
                               ExecutionMode 4 OutputVertices 4
+                              ExecutionMode 4 Isolines
+                              ExecutionMode 4 SpacingEqual
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "VS_OUT"
                               MemberName 8(VS_OUT) 0  "cpoint"
@@ -243,19 +254,24 @@ vertices = 4
                               Name 40  "ip"
                               Name 42  "m_cpid"
                               Name 44  "m_cpid"
-                              Name 47  "@entryPointOutput"
+                              Name 48  "@entryPointOutput"
-                              Name 48  "param"
                               Name 50  "param"
-                              Name 61  "@patchConstantResult"
+                              Name 52  "param"
-                              Name 62  "pid"
+                              Name 65  "@patchConstantResult"
-                              Name 63  "param"
+                              Name 66  "pid"
-                              Name 67  "@patchConstantOutput_edges"
+                              Name 67  "param"
-                              Name 77  "output"
+                              Name 72  "@patchConstantOutput_edges"
+                              Name 82  "output"
+                              Name 90  "HS_CONSTANT_OUT"
+                              Name 92  "@patchConstantOutput"
                               Decorate 40(ip) Location 0
                               Decorate 44(m_cpid) BuiltIn InvocationId
-                              Decorate 47(@entryPointOutput) Location 0
+                              Decorate 48(@entryPointOutput) Location 0
-                              Decorate 62(pid) BuiltIn PrimitiveId
+                              Decorate 66(pid) BuiltIn PrimitiveId
-                              Decorate 67(@patchConstantOutput_edges) BuiltIn TessLevelOuter
+                              Decorate 72(@patchConstantOutput_edges) Patch
+                              Decorate 72(@patchConstantOutput_edges) BuiltIn TessLevelOuter
+                              Decorate 92(@patchConstantOutput) Patch
+                              Decorate 92(@patchConstantOutput) Location 1
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -280,58 +296,66 @@ vertices = 4
           40(ip):     39(ptr) Variable Input
               43:             TypePointer Input 9(int)
       44(m_cpid):     43(ptr) Variable Input
-              46:             TypePointer Output 14(HS_OUT)
+              46:             TypeArray 14(HS_OUT) 10
-47(@entryPointOutput):     46(ptr) Variable Output
+              47:             TypePointer Output 46
-              53:      9(int) Constant 1
+48(@entryPointOutput):     47(ptr) Variable Output
-              54:      9(int) Constant 0
+              55:             TypePointer Output 14(HS_OUT)
-              56:             TypeBool
+              57:      9(int) Constant 1
-              60:             TypePointer Function 22(HS_CONSTANT_OUT)
+              58:      9(int) Constant 0
-         62(pid):     43(ptr) Variable Input
+              60:             TypeBool
-              66:             TypePointer Output 21
+              64:             TypePointer Function 22(HS_CONSTANT_OUT)
-67(@patchConstantOutput_edges):     66(ptr) Variable Output
+         66(pid):     43(ptr) Variable Input
-              68:             TypePointer Function 6(float)
+              70:             TypeArray 6(float) 10
-              71:             TypePointer Output 6(float)
+              71:             TypePointer Output 70
-              73:     29(int) Constant 1
+72(@patchConstantOutput_edges):     71(ptr) Variable Output
-              78:    6(float) Constant 1073741824
+              73:             TypePointer Function 6(float)
-              80:    6(float) Constant 1090519040
+              76:             TypePointer Output 6(float)
+              78:     29(int) Constant 1
+              83:    6(float) Constant 1073741824
+              85:    6(float) Constant 1090519040
+90(HS_CONSTANT_OUT):             TypeStruct
+              91:             TypePointer Output 90(HS_CONSTANT_OUT)
+92(@patchConstantOutput):     91(ptr) Variable Output
          4(main):           2 Function None 3
                5:             Label
           38(ip):     12(ptr) Variable Function
       42(m_cpid):     13(ptr) Variable Function
-       48(param):     12(ptr) Variable Function
+       50(param):     12(ptr) Variable Function
-       50(param):     13(ptr) Variable Function
+       52(param):     13(ptr) Variable Function
-61(@patchConstantResult):     60(ptr) Variable Function
+65(@patchConstantResult):     64(ptr) Variable Function
-       63(param):     13(ptr) Variable Function
+       67(param):     13(ptr) Variable Function
               41:          11 Load 40(ip)
                               Store 38(ip) 41
               45:      9(int) Load 44(m_cpid)
                               Store 42(m_cpid) 45
-              49:          11 Load 38(ip)
+              49:      9(int) Load 44(m_cpid)
-                              Store 48(param) 49
+              51:          11 Load 38(ip)
-              51:      9(int) Load 42(m_cpid)
                               Store 50(param) 51
-              52:  14(HS_OUT) FunctionCall 18(@main(struct-VS_OUT-vf31[4];u1;) 48(param) 50(param)
+              53:      9(int) Load 42(m_cpid)
-                              Store 47(@entryPointOutput) 52
+                              Store 52(param) 53
-                              ControlBarrier 20 53 54
+              54:  14(HS_OUT) FunctionCall 18(@main(struct-VS_OUT-vf31[4];u1;) 50(param) 52(param)
-              55:      9(int) Load 44(m_cpid)
+              56:     55(ptr) AccessChain 48(@entryPointOutput) 49
-              57:    56(bool) IEqual 55 30
+                              Store 56 54
-                              SelectionMerge 59 None
+                              ControlBarrier 20 57 58
-                              BranchConditional 57 58 59
+              59:      9(int) Load 44(m_cpid)
-              58:               Label
+              61:    60(bool) IEqual 59 30
-              64:      9(int)   Load 62(pid)
+                              SelectionMerge 63 None
-                                Store 63(param) 64
+                              BranchConditional 61 62 63
-              65:22(HS_CONSTANT_OUT)   FunctionCall 25(PCF(u1;) 63(param)
+              62:               Label
-                                Store 61(@patchConstantResult) 65
+              68:      9(int)   Load 66(pid)
-              69:     68(ptr)   AccessChain 61(@patchConstantResult) 30 30
+                                Store 67(param) 68
-              70:    6(float)   Load 69
+              69:22(HS_CONSTANT_OUT)   FunctionCall 25(PCF(u1;) 67(param)
-              72:     71(ptr)   AccessChain 67(@patchConstantOutput_edges) 30
+                                Store 65(@patchConstantResult) 69
-                                Store 72 70
+              74:     73(ptr)   AccessChain 65(@patchConstantResult) 30 30
-              74:     68(ptr)   AccessChain 61(@patchConstantResult) 30 73
               75:    6(float)   Load 74
-              76:     71(ptr)   AccessChain 67(@patchConstantOutput_edges) 73
+              77:     76(ptr)   AccessChain 72(@patchConstantOutput_edges) 30
-                                Store 76 75
+                                Store 77 75
-                                Branch 59
+              79:     73(ptr)   AccessChain 65(@patchConstantResult) 30 78
-              59:             Label
+              80:    6(float)   Load 79
+              81:     76(ptr)   AccessChain 72(@patchConstantOutput_edges) 78
+                                Store 81 80
+                                Branch 63
+              63:             Label
                               Return
                               FunctionEnd
 18(@main(struct-VS_OUT-vf31[4];u1;):  14(HS_OUT) Function None 15
@@ -349,11 +373,11 @@ vertices = 4
      25(PCF(u1;):22(HS_CONSTANT_OUT) Function None 23
          24(pid):     13(ptr) FunctionParameter
               26:             Label
-      77(output):     60(ptr) Variable Function
+      82(output):     64(ptr) Variable Function
-              79:     68(ptr) AccessChain 77(output) 30 30
+              84:     73(ptr) AccessChain 82(output) 30 30
-                              Store 79 78
+                              Store 84 83
-              81:     68(ptr) AccessChain 77(output) 30 73
+              86:     73(ptr) AccessChain 82(output) 30 78
-                              Store 81 80
+                              Store 86 85
-              82:22(HS_CONSTANT_OUT) Load 77(output)
+              87:22(HS_CONSTANT_OUT) Load 82(output)
-                              ReturnValue 82
+                              ReturnValue 87
                               FunctionEnd

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.hull.2.tesc.out

@@ -1,6 +1,7 @@
 hlsl.hull.2.tesc
-Shader version: 450
+Shader version: 500
 vertices = 4
+vertex spacing = equal_spacing
 0:? Sequence
 0:26  Function Definition: @main(struct-VS_OUT-vf31[4]; ( temp structure{ temp 3-component vector of float cpoint})
 0:26    Function Parameters: 
@@ -27,7 +28,9 @@ vertices = 4
 0:?         'ip' ( temp 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?         'ip' (layout( location=0) in 4-element array of structure{ temp 3-component vector of float cpoint})
 0:26      move second child to first child ( temp structure{ temp 3-component vector of float cpoint})
-0:?         '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:26        indirect index ( temp structure{ temp 3-component vector of float cpoint})
+0:?           '@entryPointOutput' (layout( location=0) out 4-element array of structure{ temp 3-component vector of float cpoint})
+0:?           'InvocationId' ( in uint InvocationID)
 0:26        Function Call: @main(struct-VS_OUT-vf31[4]; ( temp structure{ temp 3-component vector of float cpoint})
 0:?           'ip' ( temp 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?       Barrier ( temp void)
@@ -46,8 +49,8 @@ vertices = 4
 0:?               'pos' ( in 4-component vector of float Position)
 0:?           Sequence
 0:?             move second child to first child ( temp float)
-0:?               direct index ( out float TessLevelOuter)
+0:?               direct index ( patch out float TessLevelOuter)
-0:?                 '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?                 '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 0:?                 Constant:
 0:?                   0 (const int)
 0:?               direct index ( temp float)
@@ -58,8 +61,8 @@ vertices = 4
 0:?                 Constant:
 0:?                   0 (const int)
 0:?             move second child to first child ( temp float)
-0:?               direct index ( out float TessLevelOuter)
+0:?               direct index ( patch out float TessLevelOuter)
-0:?                 '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?                 '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 0:?                 Constant:
 0:?                   1 (const int)
 0:?               direct index ( temp float)
@@ -97,19 +100,21 @@ vertices = 4
 0:38      Branch: Return with expression
 0:38        'output' ( temp structure{ temp 2-element array of float edges})
 0:?   Linker Objects
-0:?     '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:?     '@entryPointOutput' (layout( location=0) out 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'ip' (layout( location=0) in 4-element array of structure{ temp 3-component vector of float cpoint})
+0:?     'InvocationId' ( in uint InvocationID)
 0:?     'pid' ( in uint PrimitiveID)
 0:?     'pos' ( in 4-component vector of float Position)
-0:?     'InvocationId' ( in uint InvocationID)
+0:?     '@patchConstantOutput' (layout( location=1) patch out structure{})
-0:?     '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?     '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 
 
 Linked tessellation control stage:
 
 
-Shader version: 450
+Shader version: 500
 vertices = 4
+vertex spacing = equal_spacing
 0:? Sequence
 0:26  Function Definition: @main(struct-VS_OUT-vf31[4]; ( temp structure{ temp 3-component vector of float cpoint})
 0:26    Function Parameters: 
@@ -136,7 +141,9 @@ vertices = 4
 0:?         'ip' ( temp 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?         'ip' (layout( location=0) in 4-element array of structure{ temp 3-component vector of float cpoint})
 0:26      move second child to first child ( temp structure{ temp 3-component vector of float cpoint})
-0:?         '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:26        indirect index ( temp structure{ temp 3-component vector of float cpoint})
+0:?           '@entryPointOutput' (layout( location=0) out 4-element array of structure{ temp 3-component vector of float cpoint})
+0:?           'InvocationId' ( in uint InvocationID)
 0:26        Function Call: @main(struct-VS_OUT-vf31[4]; ( temp structure{ temp 3-component vector of float cpoint})
 0:?           'ip' ( temp 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?       Barrier ( temp void)
@@ -155,8 +162,8 @@ vertices = 4
 0:?               'pos' ( in 4-component vector of float Position)
 0:?           Sequence
 0:?             move second child to first child ( temp float)
-0:?               direct index ( out float TessLevelOuter)
+0:?               direct index ( patch out float TessLevelOuter)
-0:?                 '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?                 '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 0:?                 Constant:
 0:?                   0 (const int)
 0:?               direct index ( temp float)
@@ -167,8 +174,8 @@ vertices = 4
 0:?                 Constant:
 0:?                   0 (const int)
 0:?             move second child to first child ( temp float)
-0:?               direct index ( out float TessLevelOuter)
+0:?               direct index ( patch out float TessLevelOuter)
-0:?                 '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?                 '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 0:?                 Constant:
 0:?                   1 (const int)
 0:?               direct index ( temp float)
@@ -206,22 +213,26 @@ vertices = 4
 0:38      Branch: Return with expression
 0:38        'output' ( temp structure{ temp 2-element array of float edges})
 0:?   Linker Objects
-0:?     '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:?     '@entryPointOutput' (layout( location=0) out 4-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'ip' (layout( location=0) in 4-element array of structure{ temp 3-component vector of float cpoint})
+0:?     'InvocationId' ( in uint InvocationID)
 0:?     'pid' ( in uint PrimitiveID)
 0:?     'pos' ( in 4-component vector of float Position)
-0:?     'InvocationId' ( in uint InvocationID)
+0:?     '@patchConstantOutput' (layout( location=1) patch out structure{})
-0:?     '@patchConstantOutput_edges' ( out 2-element array of float TessLevelOuter)
+0:?     '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter)
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 87
+// Id's are bound by 95
 
                               Capability Tessellation
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint TessellationControl 4  "main" 42 45 52 60 62 69
+                              EntryPoint TessellationControl 4  "main" 42 46 48 64 66 74 94
                               ExecutionMode 4 OutputVertices 4
+                              ExecutionMode 4 Isolines
+                              ExecutionMode 4 SpacingEqual
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "VS_OUT"
                               MemberName 8(VS_OUT) 0  "cpoint"
@@ -237,22 +248,27 @@ vertices = 4
                               Name 30  "output"
                               Name 40  "ip"
                               Name 42  "ip"
-                              Name 45  "@entryPointOutput"
+                              Name 46  "@entryPointOutput"
-                              Name 46  "param"
+                              Name 48  "InvocationId"
-                              Name 52  "InvocationId"
+                              Name 50  "param"
-                              Name 59  "@patchConstantResult"
+                              Name 63  "@patchConstantResult"
-                              Name 60  "pid"
+                              Name 64  "pid"
-                              Name 62  "pos"
+                              Name 66  "pos"
-                              Name 63  "param"
+                              Name 67  "param"
-                              Name 65  "param"
+                              Name 69  "param"
-                              Name 69  "@patchConstantOutput_edges"
+                              Name 74  "@patchConstantOutput_edges"
-                              Name 79  "output"
+                              Name 84  "output"
+                              Name 92  "HS_CONSTANT_OUT"
+                              Name 94  "@patchConstantOutput"
                               Decorate 42(ip) Location 0
-                              Decorate 45(@entryPointOutput) Location 0
+                              Decorate 46(@entryPointOutput) Location 0
-                              Decorate 52(InvocationId) BuiltIn InvocationId
+                              Decorate 48(InvocationId) BuiltIn InvocationId
-                              Decorate 60(pid) BuiltIn PrimitiveId
+                              Decorate 64(pid) BuiltIn PrimitiveId
-                              Decorate 62(pos) BuiltIn Position
+                              Decorate 66(pos) BuiltIn Position
-                              Decorate 69(@patchConstantOutput_edges) BuiltIn TessLevelOuter
+                              Decorate 74(@patchConstantOutput_edges) Patch
+                              Decorate 74(@patchConstantOutput_edges) BuiltIn TessLevelOuter
+                              Decorate 94(@patchConstantOutput) Patch
+                              Decorate 94(@patchConstantOutput) Location 1
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -277,59 +293,67 @@ vertices = 4
               33:             TypePointer Function 7(fvec3)
               41:             TypePointer Input 11
           42(ip):     41(ptr) Variable Input
-              44:             TypePointer Output 13(HS_OUT)
+              44:             TypeArray 13(HS_OUT) 10
-45(@entryPointOutput):     44(ptr) Variable Output
+              45:             TypePointer Output 44
-              49:      9(int) Constant 1
+46(@entryPointOutput):     45(ptr) Variable Output
-              50:      9(int) Constant 0
+              47:             TypePointer Input 9(int)
-              51:             TypePointer Input 9(int)
+48(InvocationId):     47(ptr) Variable Input
-52(InvocationId):     51(ptr) Variable Input
+              53:             TypePointer Output 13(HS_OUT)
-              54:             TypeBool
+              55:      9(int) Constant 1
-              58:             TypePointer Function 23(HS_CONSTANT_OUT)
+              56:      9(int) Constant 0
-         60(pid):     51(ptr) Variable Input
+              58:             TypeBool
-              61:             TypePointer Input 19(fvec4)
+              62:             TypePointer Function 23(HS_CONSTANT_OUT)
-         62(pos):     61(ptr) Variable Input
+         64(pid):     47(ptr) Variable Input
-              68:             TypePointer Output 22
+              65:             TypePointer Input 19(fvec4)
-69(@patchConstantOutput_edges):     68(ptr) Variable Output
+         66(pos):     65(ptr) Variable Input
-              70:             TypePointer Function 6(float)
+              72:             TypeArray 6(float) 10
-              73:             TypePointer Output 6(float)
+              73:             TypePointer Output 72
-              75:     31(int) Constant 1
+74(@patchConstantOutput_edges):     73(ptr) Variable Output
-              80:    6(float) Constant 1073741824
+              75:             TypePointer Function 6(float)
-              82:    6(float) Constant 1090519040
+              78:             TypePointer Output 6(float)
+              80:     31(int) Constant 1
+              85:    6(float) Constant 1073741824
+              87:    6(float) Constant 1090519040
+92(HS_CONSTANT_OUT):             TypeStruct
+              93:             TypePointer Output 92(HS_CONSTANT_OUT)
+94(@patchConstantOutput):     93(ptr) Variable Output
          4(main):           2 Function None 3
                5:             Label
           40(ip):     12(ptr) Variable Function
-       46(param):     12(ptr) Variable Function
+       50(param):     12(ptr) Variable Function
-59(@patchConstantResult):     58(ptr) Variable Function
+63(@patchConstantResult):     62(ptr) Variable Function
-       63(param):     18(ptr) Variable Function
+       67(param):     18(ptr) Variable Function
-       65(param):     20(ptr) Variable Function
+       69(param):     20(ptr) Variable Function
               43:          11 Load 42(ip)
                               Store 40(ip) 43
-              47:          11 Load 40(ip)
+              49:      9(int) Load 48(InvocationId)
-                              Store 46(param) 47
+              51:          11 Load 40(ip)
-              48:  13(HS_OUT) FunctionCall 16(@main(struct-VS_OUT-vf31[4];) 46(param)
+                              Store 50(param) 51
-                              Store 45(@entryPointOutput) 48
+              52:  13(HS_OUT) FunctionCall 16(@main(struct-VS_OUT-vf31[4];) 50(param)
-                              ControlBarrier 21 49 50
+              54:     53(ptr) AccessChain 46(@entryPointOutput) 49
-              53:      9(int) Load 52(InvocationId)
+                              Store 54 52
-              55:    54(bool) IEqual 53 32
+                              ControlBarrier 21 55 56
-                              SelectionMerge 57 None
+              57:      9(int) Load 48(InvocationId)
-                              BranchConditional 55 56 57
+              59:    58(bool) IEqual 57 32
-              56:               Label
+                              SelectionMerge 61 None
-              64:      9(int)   Load 60(pid)
+                              BranchConditional 59 60 61
-                                Store 63(param) 64
+              60:               Label
-              66:   19(fvec4)   Load 62(pos)
+              68:      9(int)   Load 64(pid)
-                                Store 65(param) 66
+                                Store 67(param) 68
-              67:23(HS_CONSTANT_OUT)   FunctionCall 27(PCF(u1;vf4;) 63(param) 65(param)
+              70:   19(fvec4)   Load 66(pos)
-                                Store 59(@patchConstantResult) 67
+                                Store 69(param) 70
-              71:     70(ptr)   AccessChain 59(@patchConstantResult) 32 32
+              71:23(HS_CONSTANT_OUT)   FunctionCall 27(PCF(u1;vf4;) 67(param) 69(param)
-              72:    6(float)   Load 71
+                                Store 63(@patchConstantResult) 71
-              74:     73(ptr)   AccessChain 69(@patchConstantOutput_edges) 32
+              76:     75(ptr)   AccessChain 63(@patchConstantResult) 32 32
-                                Store 74 72
-              76:     70(ptr)   AccessChain 59(@patchConstantResult) 32 75
               77:    6(float)   Load 76
-              78:     73(ptr)   AccessChain 69(@patchConstantOutput_edges) 75
+              79:     78(ptr)   AccessChain 74(@patchConstantOutput_edges) 32
-                                Store 78 77
+                                Store 79 77
-                                Branch 57
+              81:     75(ptr)   AccessChain 63(@patchConstantResult) 32 80
-              57:             Label
+              82:    6(float)   Load 81
+              83:     78(ptr)   AccessChain 74(@patchConstantOutput_edges) 80
+                                Store 83 82
+                                Branch 61
+              61:             Label
                               Return
                               FunctionEnd
 16(@main(struct-VS_OUT-vf31[4];):  13(HS_OUT) Function None 14
@@ -347,11 +371,11 @@ vertices = 4
          25(pid):     18(ptr) FunctionParameter
          26(pos):     20(ptr) FunctionParameter
               28:             Label
-      79(output):     58(ptr) Variable Function
+      84(output):     62(ptr) Variable Function
-              81:     70(ptr) AccessChain 79(output) 32 32
+              86:     75(ptr) AccessChain 84(output) 32 32
-                              Store 81 80
+                              Store 86 85
-              83:     70(ptr) AccessChain 79(output) 32 75
+              88:     75(ptr) AccessChain 84(output) 32 80
-                              Store 83 82
+                              Store 88 87
-              84:23(HS_CONSTANT_OUT) Load 79(output)
+              89:23(HS_CONSTANT_OUT) Load 84(output)
-                              ReturnValue 84
+                              ReturnValue 89
                               FunctionEnd

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.hull.void.tesc.out

@@ -1,6 +1,7 @@
 hlsl.hull.void.tesc
-Shader version: 450
+Shader version: 500
 vertices = 3
+vertex spacing = fractional_even_spacing
 0:? Sequence
 0:26  Function Definition: @main(struct-VS_OUT-vf31[3]; ( temp structure{ temp 3-component vector of float cpoint})
 0:26    Function Parameters: 
@@ -27,7 +28,9 @@ vertices = 3
 0:?         'ip' ( temp 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?         'ip' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float cpoint})
 0:26      move second child to first child ( temp structure{ temp 3-component vector of float cpoint})
-0:?         '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:26        indirect index ( temp structure{ temp 3-component vector of float cpoint})
+0:?           '@entryPointOutput' (layout( location=0) out 3-element array of structure{ temp 3-component vector of float cpoint})
+0:?           'InvocationId' ( in uint InvocationID)
 0:26        Function Call: @main(struct-VS_OUT-vf31[3]; ( temp structure{ temp 3-component vector of float cpoint})
 0:?           'ip' ( temp 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?       Barrier ( temp void)
@@ -38,11 +41,12 @@ vertices = 3
 0:?           Constant:
 0:?             0 (const int)
 0:?         true case
+0:?         Sequence
 0:?           Function Call: PCF( ( temp void)
 0:33  Function Definition: PCF( ( temp void)
 0:33    Function Parameters: 
 0:?   Linker Objects
-0:?     '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:?     '@entryPointOutput' (layout( location=0) out 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'ip' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'InvocationId' ( in uint InvocationID)
 
@@ -50,8 +54,9 @@ vertices = 3
 Linked tessellation control stage:
 
 
-Shader version: 450
+Shader version: 500
 vertices = 3
+vertex spacing = fractional_even_spacing
 0:? Sequence
 0:26  Function Definition: @main(struct-VS_OUT-vf31[3]; ( temp structure{ temp 3-component vector of float cpoint})
 0:26    Function Parameters: 
@@ -78,7 +83,9 @@ vertices = 3
 0:?         'ip' ( temp 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?         'ip' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float cpoint})
 0:26      move second child to first child ( temp structure{ temp 3-component vector of float cpoint})
-0:?         '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:26        indirect index ( temp structure{ temp 3-component vector of float cpoint})
+0:?           '@entryPointOutput' (layout( location=0) out 3-element array of structure{ temp 3-component vector of float cpoint})
+0:?           'InvocationId' ( in uint InvocationID)
 0:26        Function Call: @main(struct-VS_OUT-vf31[3]; ( temp structure{ temp 3-component vector of float cpoint})
 0:?           'ip' ( temp 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?       Barrier ( temp void)
@@ -89,23 +96,27 @@ vertices = 3
 0:?           Constant:
 0:?             0 (const int)
 0:?         true case
+0:?         Sequence
 0:?           Function Call: PCF( ( temp void)
 0:33  Function Definition: PCF( ( temp void)
 0:33    Function Parameters: 
 0:?   Linker Objects
-0:?     '@entryPointOutput' (layout( location=0) out structure{ temp 3-component vector of float cpoint})
+0:?     '@entryPointOutput' (layout( location=0) out 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'ip' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'InvocationId' ( in uint InvocationID)
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 51
+// Id's are bound by 55
 
                               Capability Tessellation
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint TessellationControl 4  "main" 33 36 44
+                              EntryPoint TessellationControl 4  "main" 33 37 39
                               ExecutionMode 4 OutputVertices 3
+                              ExecutionMode 4 Triangles
+                              ExecutionMode 4 SpacingFractionalEven
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "VS_OUT"
                               MemberName 8(VS_OUT) 0  "cpoint"
@@ -117,12 +128,12 @@ vertices = 3
                               Name 21  "output"
                               Name 31  "ip"
                               Name 33  "ip"
-                              Name 36  "@entryPointOutput"
+                              Name 37  "@entryPointOutput"
-                              Name 37  "param"
+                              Name 39  "InvocationId"
-                              Name 44  "InvocationId"
+                              Name 41  "param"
                               Decorate 33(ip) Location 0
-                              Decorate 36(@entryPointOutput) Location 0
+                              Decorate 37(@entryPointOutput) Location 0
-                              Decorate 44(InvocationId) BuiltIn InvocationId
+                              Decorate 39(InvocationId) BuiltIn InvocationId
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -140,33 +151,37 @@ vertices = 3
               24:             TypePointer Function 7(fvec3)
               32:             TypePointer Input 11
           33(ip):     32(ptr) Variable Input
-              35:             TypePointer Output 13(HS_OUT)
+              35:             TypeArray 13(HS_OUT) 10
-36(@entryPointOutput):     35(ptr) Variable Output
+              36:             TypePointer Output 35
-              40:      9(int) Constant 2
+37(@entryPointOutput):     36(ptr) Variable Output
-              41:      9(int) Constant 1
+              38:             TypePointer Input 9(int)
-              42:      9(int) Constant 0
+39(InvocationId):     38(ptr) Variable Input
-              43:             TypePointer Input 9(int)
+              44:             TypePointer Output 13(HS_OUT)
-44(InvocationId):     43(ptr) Variable Input
+              46:      9(int) Constant 2
-              46:             TypeBool
+              47:      9(int) Constant 1
+              48:      9(int) Constant 0
+              50:             TypeBool
          4(main):           2 Function None 3
                5:             Label
           31(ip):     12(ptr) Variable Function
-       37(param):     12(ptr) Variable Function
+       41(param):     12(ptr) Variable Function
               34:          11 Load 33(ip)
                               Store 31(ip) 34
-              38:          11 Load 31(ip)
+              40:      9(int) Load 39(InvocationId)
-                              Store 37(param) 38
+              42:          11 Load 31(ip)
-              39:  13(HS_OUT) FunctionCall 16(@main(struct-VS_OUT-vf31[3];) 37(param)
+                              Store 41(param) 42
-                              Store 36(@entryPointOutput) 39
+              43:  13(HS_OUT) FunctionCall 16(@main(struct-VS_OUT-vf31[3];) 41(param)
-                              ControlBarrier 40 41 42
+              45:     44(ptr) AccessChain 37(@entryPointOutput) 40
-              45:      9(int) Load 44(InvocationId)
+                              Store 45 43
-              47:    46(bool) IEqual 45 23
+                              ControlBarrier 46 47 48
-                              SelectionMerge 49 None
+              49:      9(int) Load 39(InvocationId)
-                              BranchConditional 47 48 49
+              51:    50(bool) IEqual 49 23
-              48:               Label
+                              SelectionMerge 53 None
-              50:           2   FunctionCall 18(PCF()
+                              BranchConditional 51 52 53
-                                Branch 49
+              52:               Label
-              49:             Label
+              54:           2   FunctionCall 18(PCF()
+                                Branch 53
+              53:             Label
                               Return
                               FunctionEnd
 16(@main(struct-VS_OUT-vf31[3];):  13(HS_OUT) Function None 14

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.identifier.sample.frag.out

@@ -1,5 +1,5 @@
 hlsl.identifier.sample.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:9  Function Definition: sample(i1; ( temp int)
@@ -44,7 +44,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:9  Function Definition: sample(i1; ( temp int)
@@ -94,6 +94,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 31
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 10  "sample(i1;"
                               Name 9  "x"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.if.frag.out

@@ -1,5 +1,5 @@
 hlsl.if.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -69,6 +69,7 @@ gl_FragCoord origin is upper left
 0:26              'input' ( in 4-component vector of float)
 0:30      Test condition and select ( temp void)
 0:30        Condition
+0:30        Convert float to bool ( temp bool)
 0:30          move second child to first child ( temp float)
 0:30            'ii' ( temp float)
 0:30            direct index ( temp float)
@@ -108,7 +109,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -178,6 +179,7 @@ gl_FragCoord origin is upper left
 0:26              'input' ( in 4-component vector of float)
 0:30      Test condition and select ( temp void)
 0:30        Condition
+0:30        Convert float to bool ( temp bool)
 0:30          move second child to first child ( temp float)
 0:30            'ii' ( temp float)
 0:30            direct index ( temp float)
@@ -215,24 +217,25 @@ gl_FragCoord origin is upper left
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 101
+// Id's are bound by 103
 
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "PixelShaderFunction" 94 97
+                              EntryPoint Fragment 4  "PixelShaderFunction" 96 99
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "@PixelShaderFunction(vf4;"
                               Name 10  "input"
                               Name 68  "ii"
-                              Name 80  "ii"
+                              Name 82  "ii"
-                              Name 92  "input"
                               Name 94  "input"
-                              Name 97  "@entryPointOutput"
+                              Name 96  "input"
-                              Name 98  "param"
+                              Name 99  "@entryPointOutput"
-                              Decorate 94(input) Location 0
+                              Name 100  "param"
-                              Decorate 97(@entryPointOutput) Location 0
+                              Decorate 96(input) Location 0
+                              Decorate 99(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -244,31 +247,32 @@ gl_FragCoord origin is upper left
               67:             TypePointer Function 6(float)
               69:             TypeInt 32 0
               70:     69(int) Constant 2
-              76:    6(float) Constant 1065353216
+              73:    6(float) Constant 0
-              78:             TypeInt 32 1
+              78:    6(float) Constant 1065353216
-              79:             TypePointer Function 78(int)
+              80:             TypeInt 32 1
-              82:     78(int) Constant 1
+              81:             TypePointer Function 80(int)
-              93:             TypePointer Input 7(fvec4)
+              84:     80(int) Constant 1
-       94(input):     93(ptr) Variable Input
+              95:             TypePointer Input 7(fvec4)
-              96:             TypePointer Output 7(fvec4)
+       96(input):     95(ptr) Variable Input
-97(@entryPointOutput):     96(ptr) Variable Output
+              98:             TypePointer Output 7(fvec4)
+99(@entryPointOutput):     98(ptr) Variable Output
 4(PixelShaderFunction):           2 Function None 3
                5:             Label
-       92(input):      8(ptr) Variable Function
+       94(input):      8(ptr) Variable Function
-       98(param):      8(ptr) Variable Function
+      100(param):      8(ptr) Variable Function
-              95:    7(fvec4) Load 94(input)
+              97:    7(fvec4) Load 96(input)
-                              Store 92(input) 95
+                              Store 94(input) 97
-              99:    7(fvec4) Load 92(input)
+             101:    7(fvec4) Load 94(input)
-                              Store 98(param) 99
+                              Store 100(param) 101
-             100:    7(fvec4) FunctionCall 11(@PixelShaderFunction(vf4;) 98(param)
+             102:    7(fvec4) FunctionCall 11(@PixelShaderFunction(vf4;) 100(param)
-                              Store 97(@entryPointOutput) 100
+                              Store 99(@entryPointOutput) 102
                               Return
                               FunctionEnd
 11(@PixelShaderFunction(vf4;):    7(fvec4) Function None 9
        10(input):      8(ptr) FunctionParameter
               12:             Label
           68(ii):     67(ptr) Variable Function
-          80(ii):     79(ptr) Variable Function
+          82(ii):     81(ptr) Variable Function
               13:    7(fvec4) Load 10(input)
               14:    7(fvec4) Load 10(input)
               17:   16(bvec4) FOrdEqual 13 14
@@ -338,28 +342,29 @@ gl_FragCoord origin is upper left
               71:     67(ptr) AccessChain 10(input) 70
               72:    6(float) Load 71
                               Store 68(ii) 72
-                              SelectionMerge 74 None
+              74:    15(bool) FOrdNotEqual 72 73
-                              BranchConditional 72 73 74
+                              SelectionMerge 76 None
-              73:               Label
+                              BranchConditional 74 75 76
-              75:    6(float)   Load 68(ii)
+              75:               Label
-              77:    6(float)   FAdd 75 76
+              77:    6(float)   Load 68(ii)
-                                Store 68(ii) 77
+              79:    6(float)   FAdd 77 78
-                                Branch 74
+                                Store 68(ii) 79
-              74:             Label
+                                Branch 76
-              81:     78(int) Load 80(ii)
+              76:             Label
-              83:     78(int) IAdd 81 82
+              83:     80(int) Load 82(ii)
-                              Store 80(ii) 83
+              85:     80(int) IAdd 83 84
-              84:     78(int) Load 80(ii)
+                              Store 82(ii) 85
-              85:    6(float) ConvertSToF 84
+              86:     80(int) Load 82(ii)
-              86:    15(bool) FOrdEqual 85 76
+              87:    6(float) ConvertSToF 86
-                              SelectionMerge 88 None
+              88:    15(bool) FOrdEqual 87 78
-                              BranchConditional 86 87 88
+                              SelectionMerge 90 None
-              87:               Label
+                              BranchConditional 88 89 90
-              89:     78(int)   Load 80(ii)
+              89:               Label
-              90:     78(int)   IAdd 89 82
+              91:     80(int)   Load 82(ii)
-                                Store 80(ii) 90
+              92:     80(int)   IAdd 91 84
-                                Branch 88
+                                Store 82(ii) 92
-              88:             Label
+                                Branch 90
-              91:    7(fvec4) Undef
+              90:             Label
-                              ReturnValue 91
+              93:    7(fvec4) Undef
+                              ReturnValue 93
                               FunctionEnd

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.init.frag.out

@@ -2,7 +2,7 @@ hlsl.init.frag
 WARNING: 0:40: 'typedef' : struct-member initializers ignored 
 WARNING: 0:40: 'typedef' : struct-member initializers ignored 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:1  Sequence
@@ -168,7 +168,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:1  Sequence
@@ -339,6 +339,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "ShaderFunction" 98 101
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "ShaderFunction"
                               Name 11  "@ShaderFunction(vf4;"
                               Name 10  "input"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.init2.frag.out

@@ -1,5 +1,5 @@
 hlsl.init2.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: Test1( ( temp void)
@@ -180,7 +180,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: Test1( ( temp void)
@@ -366,6 +366,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 109
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 6  "Test1("
                               Name 10  "PS_OUTPUT"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.inoutquals.frag.out

@@ -1,5 +1,5 @@
 hlsl.inoutquals.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:8  Function Definition: MyFunc(f1;f1;f1; ( temp void)
@@ -95,7 +95,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:8  Function Definition: MyFunc(f1;f1;f1; ( temp void)
@@ -197,6 +197,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 60 70 74 78
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 12  "MyFunc(f1;f1;f1;"
                               Name 9  "x"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.barriers.comp.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.barriers.comp
-Shader version: 450
+Shader version: 500
 local_size = (1, 1, 1)
 0:? Sequence
 0:3  Function Definition: @ComputeShaderFunction( ( temp float)
@@ -27,7 +27,7 @@ local_size = (1, 1, 1)
 Linked compute stage:
 
 
-Shader version: 450
+Shader version: 500
 local_size = (1, 1, 1)
 0:? Sequence
 0:3  Function Definition: @ComputeShaderFunction( ( temp float)
@@ -60,6 +60,7 @@ local_size = (1, 1, 1)
                               MemoryModel Logical GLSL450
                               EntryPoint GLCompute 4  "ComputeShaderFunction" 20
                               ExecutionMode 4 LocalSize 1 1 1
+                              Source HLSL 500
                               Name 4  "ComputeShaderFunction"
                               Name 8  "@ComputeShaderFunction("
                               Name 20  "@entryPointOutput"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.comp.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.comp
-Shader version: 450
+Shader version: 500
 local_size = (1, 1, 1)
 0:? Sequence
 0:17  Function Definition: ComputeShaderFunctionS(f1;f1;f1;u1;u1; ( temp float)
@@ -355,7 +355,7 @@ local_size = (1, 1, 1)
 Linked compute stage:
 
 
-Shader version: 450
+Shader version: 500
 local_size = (1, 1, 1)
 0:? Sequence
 0:17  Function Definition: ComputeShaderFunctionS(f1;f1;f1;u1;u1; ( temp float)
@@ -716,6 +716,7 @@ local_size = (1, 1, 1)
                               MemoryModel Logical GLSL450
                               EntryPoint GLCompute 4  "ComputeShaderFunction" 227 230 233 237 240 243
                               ExecutionMode 4 LocalSize 1 1 1
+                              Source HLSL 500
                               Name 4  "ComputeShaderFunction"
                               Name 16  "ComputeShaderFunctionS(f1;f1;f1;u1;u1;"
                               Name 11  "inF0"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.d3dcolortoubyte4.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:5  Function Definition: @main( ( temp 4-component vector of int)
@@ -38,7 +38,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:5  Function Definition: @main( ( temp 4-component vector of int)
@@ -82,6 +82,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 27
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 9  "@main("
                               Name 14  "$Global"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.double.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.double.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:5  Function Definition: @PixelShaderFunction(d1;d1;d1;vd2;vd3;vd4;u1;u1; ( temp float)
@@ -83,7 +83,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:5  Function Definition: @PixelShaderFunction(d1;d1;d1;vd2;vd3;vd4;u1;u1; ( temp float)
@@ -173,6 +173,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 44 47 50 54 58 62 66 69 72
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 26  "@PixelShaderFunction(d1;d1;d1;vd2;vd3;vd4;u1;u1;"
                               Name 18  "inDV1a"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.evalfns.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.evalfns.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: @main(f1;vf2;vf3;vf4;vi2; ( temp void)
@@ -78,7 +78,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: @main(f1;vf2;vf3;vf4;vi2; ( temp void)
@@ -163,6 +163,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 51 55 59 63 67
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 23  "@main(f1;vf2;vf3;vf4;vi2;"
                               Name 18  "inF1"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.f1632.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.f1632.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: PixelShaderFunctionS(u1; ( temp float)
@@ -131,7 +131,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: PixelShaderFunctionS(u1; ( temp float)
@@ -268,6 +268,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 101
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 11  "PixelShaderFunctionS(u1;"
                               Name 10  "inF0"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.f3216.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.f3216.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: PixelShaderFunctionS(f1; ( temp uint)
@@ -136,7 +136,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: PixelShaderFunctionS(f1; ( temp uint)
@@ -278,6 +278,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 104
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 11  "PixelShaderFunctionS(f1;"
                               Name 10  "inF0"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.lit.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.lit.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(f1;f1;f1; ( temp void)
@@ -60,7 +60,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(f1;f1;f1; ( temp void)
@@ -126,6 +126,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 37 40 43
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 12  "@PixelShaderFunction(f1;f1;f1;"
                               Name 9  "n_dot_l"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.negative.comp.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.negative.comp
-Shader version: 450
+Shader version: 500
 local_size = (1, 1, 1)
 0:? Sequence
 0:2  Function Definition: ComputeShaderFunctionS(f1;f1;f1;i1; ( temp float)
@@ -91,7 +91,7 @@ local_size = (1, 1, 1)
 Linked compute stage:
 
 
-Shader version: 450
+Shader version: 500
 local_size = (1, 1, 1)
 0:? Sequence
 0:2  Function Definition: ComputeShaderFunctionS(f1;f1;f1;i1; ( temp float)
@@ -188,6 +188,7 @@ local_size = (1, 1, 1)
                               MemoryModel Logical GLSL450
                               EntryPoint GLCompute 4  "ComputeShaderFunction" 76 79 82 86 89
                               ExecutionMode 4 LocalSize 1 1 1
+                              Source HLSL 500
                               Name 4  "ComputeShaderFunction"
                               Name 15  "ComputeShaderFunctionS(f1;f1;f1;i1;"
                               Name 11  "inF0"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.negative.frag.out

@@ -1,6 +1,5 @@
 hlsl.intrinsics.negative.frag
 ERROR: 0:10: 'determinant' : no matching overloaded function found 
-ERROR: 0:23: 'length' : ambiguous best function under implicit type conversion 
 ERROR: 0:25: 'normalize' : ambiguous best function under implicit type conversion 
 ERROR: 0:26: 'reflect' : ambiguous best function under implicit type conversion 
 ERROR: 0:27: 'refract' : ambiguous best function under implicit type conversion 
@@ -59,10 +58,10 @@ ERROR: 0:133: 'normalize' : no matching overloaded function found
 ERROR: 0:133: 'reflect' : no matching overloaded function found 
 ERROR: 0:133: 'refract' : no matching overloaded function found 
 ERROR: 0:133: 'reversebits' : no matching overloaded function found 
-ERROR: 60 compilation errors.  No code generated.
+ERROR: 59 compilation errors.  No code generated.
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
 0:2  Function Definition: PixelShaderFunctionS(f1;f1;f1;i1; ( temp float)
@@ -120,7 +119,6 @@ ERROR: node is still EOpNull!
 0:14        Convert float to uint ( temp uint)
 0:14          'inF0' ( in float)
 0:23      length ( temp float)
-0:23        Construct vec2 ( in 2-component vector of float)
 0:23        'inF0' ( in float)
 0:24      Function Call: msad4(u1;vu2;vu4; ( temp 4-component vector of uint)
 0:24        Convert float to uint ( temp uint)
@@ -524,7 +522,7 @@ ERROR: node is still EOpNull!
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
 0:2  Function Definition: PixelShaderFunctionS(f1;f1;f1;i1; ( temp float)
@@ -582,7 +580,6 @@ ERROR: node is still EOpNull!
 0:14        Convert float to uint ( temp uint)
 0:14          'inF0' ( in float)
 0:23      length ( temp float)
-0:23        Construct vec2 ( in 2-component vector of float)
 0:23        'inF0' ( in float)
 0:24      Function Call: msad4(u1;vu2;vu4; ( temp 4-component vector of uint)
 0:24        Convert float to uint ( temp uint)

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.negative.vert.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.negative.vert
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:15  Function Definition: VertexShaderFunctionS(f1;f1;f1;i1; ( temp float)
 0:15    Function Parameters: 
@@ -155,7 +155,7 @@ Shader version: 450
 Linked vertex stage:
 
 
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:15  Function Definition: VertexShaderFunctionS(f1;f1;f1;i1; ( temp float)
 0:15    Function Parameters: 
@@ -315,6 +315,7 @@ Shader version: 450
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Vertex 4  "VertexShaderFunction" 100 103 106 110 113
+                              Source HLSL 500
                               Name 4  "VertexShaderFunction"
                               Name 15  "VertexShaderFunctionS(f1;f1;f1;i1;"
                               Name 11  "inF0"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.promote.down.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.promote.down.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:15  Function Definition: @main( ( temp structure{ temp 4-component vector of float color})
@@ -53,7 +53,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:15  Function Definition: @main( ( temp structure{ temp 4-component vector of float color})
@@ -112,6 +112,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 47
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.promote.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.promote.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:20  Function Definition: @main( ( temp structure{ temp 4-component vector of float color})
@@ -341,8 +341,8 @@ gl_FragCoord origin is upper left
 0:51        move second child to first child ( temp float)
 0:51          'r50' ( temp float)
 0:51          Construct float ( temp float)
-0:?             imageLoad ( temp 4-component vector of float)
+0:?             textureFetch ( temp 4-component vector of float)
-0:51              'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:51              'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:51              Convert uint to int ( temp int)
 0:51                upos: direct index for structure ( uniform uint)
 0:51                  'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2,  uniform uint upos,  uniform float fpos})
@@ -352,8 +352,8 @@ gl_FragCoord origin is upper left
 0:52        move second child to first child ( temp float)
 0:52          'r51' ( temp float)
 0:52          Construct float ( temp float)
-0:?             imageLoad ( temp 4-component vector of float)
+0:?             textureFetch ( temp 4-component vector of float)
-0:52              'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:52              'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:52              Convert float to int ( temp int)
 0:52                fpos: direct index for structure ( uniform float)
 0:52                  'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2,  uniform uint upos,  uniform float fpos})
@@ -437,7 +437,7 @@ gl_FragCoord origin is upper left
 0:20              0 (const int)
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2,  uniform uint upos,  uniform float fpos})
-0:?     'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:?     'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:?     'g_tTex1df4' ( uniform texture1D)
 0:?     'color' (layout( location=0) out 4-component vector of float)
 
@@ -445,7 +445,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:20  Function Definition: @main( ( temp structure{ temp 4-component vector of float color})
@@ -787,8 +787,8 @@ gl_FragCoord origin is upper left
 0:51        move second child to first child ( temp float)
 0:51          'r50' ( temp float)
 0:51          Construct float ( temp float)
-0:?             imageLoad ( temp 4-component vector of float)
+0:?             textureFetch ( temp 4-component vector of float)
-0:51              'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:51              'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:51              Convert uint to int ( temp int)
 0:51                upos: direct index for structure ( uniform uint)
 0:51                  'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2,  uniform uint upos,  uniform float fpos})
@@ -798,8 +798,8 @@ gl_FragCoord origin is upper left
 0:52        move second child to first child ( temp float)
 0:52          'r51' ( temp float)
 0:52          Construct float ( temp float)
-0:?             imageLoad ( temp 4-component vector of float)
+0:?             textureFetch ( temp 4-component vector of float)
-0:52              'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:52              'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:52              Convert float to int ( temp int)
 0:52                fpos: direct index for structure ( uniform float)
 0:52                  'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2,  uniform uint upos,  uniform float fpos})
@@ -883,7 +883,7 @@ gl_FragCoord origin is upper left
 0:20              0 (const int)
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2,  uniform uint upos,  uniform float fpos})
-0:?     'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:?     'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:?     'g_tTex1df4' ( uniform texture1D)
 0:?     'color' (layout( location=0) out 4-component vector of float)
 
@@ -899,6 +899,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 319
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "color"
@@ -964,7 +965,6 @@ gl_FragCoord origin is upper left
                               Decorate 19($Global) Block
                               Decorate 21 DescriptorSet 0
                               Decorate 258(g_tTexbfs) DescriptorSet 0
-                              Decorate 258(g_tTexbfs) NonWritable
                               Decorate 277(g_tTex1df4) DescriptorSet 0
                               Decorate 319(color) Location 0
                2:             TypeVoid
@@ -1013,7 +1013,7 @@ gl_FragCoord origin is upper left
              107:   16(ivec2) ConstantComposite 44 44
              109:     14(int) Constant 4
              110:             TypePointer Uniform 16(ivec2)
-             256:             TypeImage 6(float) Buffer nonsampled format:R32f
+             256:             TypeImage 6(float) Buffer sampled format:R32f
              257:             TypePointer UniformConstant 256
   258(g_tTexbfs):    257(ptr) Variable UniformConstant
              260:     14(int) Constant 8
@@ -1275,14 +1275,14 @@ gl_FragCoord origin is upper left
              261:     23(ptr) AccessChain 21 260
              262:     15(int) Load 261
              263:     14(int) Bitcast 262
-             264:    7(fvec4) ImageRead 259 263
+             264:    7(fvec4) ImageFetch 259 263
              265:    6(float) CompositeExtract 264 0
                               Store 255(r50) 265
              267:         256 Load 258(g_tTexbfs)
              269:     33(ptr) AccessChain 21 268
              270:    6(float) Load 269
              271:     14(int) ConvertFToS 270
-             272:    7(fvec4) ImageRead 267 271
+             272:    7(fvec4) ImageFetch 267 271
              273:    6(float) CompositeExtract 272 0
                               Store 266(r51) 273
              278:         275 Load 277(g_tTex1df4)

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out

@@ -1,5 +1,5 @@
 hlsl.intrinsics.promote.outputs.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:20  Function Definition: @main( ( temp structure{ temp 4-component vector of float color})
@@ -95,7 +95,7 @@ gl_FragCoord origin is upper left
 0:20              0 (const int)
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2,  uniform uint upos,  uniform float fpos})
-0:?     'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:?     'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:?     'g_tTex1df4' ( uniform texture1D)
 0:?     'color' (layout( location=0) out 4-component vector of float)
 
@@ -103,7 +103,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:20  Function Definition: @main( ( temp structure{ temp 4-component vector of float color})
@@ -199,7 +199,7 @@ gl_FragCoord origin is upper left
 0:20              0 (const int)
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2,  uniform uint upos,  uniform float fpos})
-0:?     'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:?     'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:?     'g_tTex1df4' ( uniform texture1D)
 0:?     'color' (layout( location=0) out 4-component vector of float)
 
@@ -215,6 +215,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 74
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "color"
@@ -258,7 +259,6 @@ gl_FragCoord origin is upper left
                               Decorate 31(g_tTex1df4) DescriptorSet 0
                               Decorate 74(color) Location 0
                               Decorate 79(g_tTexbfs) DescriptorSet 0
-                              Decorate 79(g_tTexbfs) NonWritable
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -289,7 +289,7 @@ gl_FragCoord origin is upper left
               68:             TypePointer Function 7(fvec4)
               73:             TypePointer Output 7(fvec4)
        74(color):     73(ptr) Variable Output
-              77:             TypeImage 6(float) Buffer nonsampled format:R32f
+              77:             TypeImage 6(float) Buffer sampled format:R32f
               78:             TypePointer UniformConstant 77
    79(g_tTexbfs):     78(ptr) Variable UniformConstant
          4(main):           2 Function None 3

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.layout.frag.out

@@ -1,5 +1,5 @@
 hlsl.layout.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:16  Function Definition: PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -35,7 +35,7 @@ Linked fragment stage:
 
 WARNING: Linking fragment stage: Entry point not found
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:16  Function Definition: PixelShaderFunction(vf4; ( temp 4-component vector of float)
@@ -75,6 +75,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main"
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 11  "PixelShaderFunction(vf4;"
                               Name 10  "input"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.2dms.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.2dms.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:28  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -179,7 +179,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:28  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -366,6 +366,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 120 124
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.array.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.array.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:48  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -194,7 +194,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:48  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -396,6 +396,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 104 108
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.basic.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.basic.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:48  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -245,7 +245,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:48  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -498,6 +498,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 133 137
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.basic.dx10.vert.out

@@ -1,5 +1,5 @@
 hlsl.load.basic.dx10.vert
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:47  Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos})
 0:47    Function Parameters: 
@@ -227,7 +227,7 @@ Shader version: 450
 Linked vertex stage:
 
 
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:47  Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos})
 0:47    Function Parameters: 
@@ -461,6 +461,7 @@ Shader version: 450
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Vertex 4  "main" 129 173
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "VS_OUTPUT"
                               MemberName 8(VS_OUTPUT) 0  "Pos"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.buffer.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.buffer.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -8,8 +8,8 @@ gl_FragCoord origin is upper left
 0:28      Sequence
 0:28        move second child to first child ( temp 4-component vector of float)
 0:28          'r00' ( temp 4-component vector of float)
-0:28          imageLoad ( temp 4-component vector of float)
+0:28          textureFetch ( temp 4-component vector of float)
-0:28            'g_tTexbf4' (layout( rgba32f) readonly uniform imageBuffer)
+0:28            'g_tTexbf4' (layout( rgba32f) uniform textureBuffer)
 0:28            c1: direct index for structure ( uniform int)
 0:28              'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:28              Constant:
@@ -17,8 +17,8 @@ gl_FragCoord origin is upper left
 0:29      Sequence
 0:29        move second child to first child ( temp 4-component vector of int)
 0:29          'r01' ( temp 4-component vector of int)
-0:29          imageLoad ( temp 4-component vector of int)
+0:29          textureFetch ( temp 4-component vector of int)
-0:29            'g_tTexbi4' (layout( rgba32i) readonly uniform iimageBuffer)
+0:29            'g_tTexbi4' (layout( rgba32i) uniform itextureBuffer)
 0:29            c1: direct index for structure ( uniform int)
 0:29              'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:29              Constant:
@@ -26,8 +26,8 @@ gl_FragCoord origin is upper left
 0:30      Sequence
 0:30        move second child to first child ( temp 4-component vector of uint)
 0:30          'r02' ( temp 4-component vector of uint)
-0:30          imageLoad ( temp 4-component vector of uint)
+0:30          textureFetch ( temp 4-component vector of uint)
-0:30            'g_tTexbu4' (layout( rgba32ui) readonly uniform uimageBuffer)
+0:30            'g_tTexbu4' (layout( rgba32ui) uniform utextureBuffer)
 0:30            c1: direct index for structure ( uniform int)
 0:30              'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:30              Constant:
@@ -71,10 +71,10 @@ gl_FragCoord origin is upper left
 0:24            Constant:
 0:24              1 (const int)
 0:?   Linker Objects
-0:?     'g_tTexbf4_test' (layout( binding=0 rgba32f) readonly uniform imageBuffer)
+0:?     'g_tTexbf4_test' (layout( binding=0 rgba32f) uniform textureBuffer)
-0:?     'g_tTexbf4' (layout( rgba32f) readonly uniform imageBuffer)
+0:?     'g_tTexbf4' (layout( rgba32f) uniform textureBuffer)
-0:?     'g_tTexbi4' (layout( rgba32i) readonly uniform iimageBuffer)
+0:?     'g_tTexbi4' (layout( rgba32i) uniform itextureBuffer)
-0:?     'g_tTexbu4' (layout( rgba32ui) readonly uniform uimageBuffer)
+0:?     'g_tTexbu4' (layout( rgba32ui) uniform utextureBuffer)
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:?     'Color' (layout( location=0) out 4-component vector of float)
 0:?     'Depth' ( out float FragDepth)
@@ -83,7 +83,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -92,8 +92,8 @@ gl_FragCoord origin is upper left
 0:28      Sequence
 0:28        move second child to first child ( temp 4-component vector of float)
 0:28          'r00' ( temp 4-component vector of float)
-0:28          imageLoad ( temp 4-component vector of float)
+0:28          textureFetch ( temp 4-component vector of float)
-0:28            'g_tTexbf4' (layout( rgba32f) readonly uniform imageBuffer)
+0:28            'g_tTexbf4' (layout( rgba32f) uniform textureBuffer)
 0:28            c1: direct index for structure ( uniform int)
 0:28              'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:28              Constant:
@@ -101,8 +101,8 @@ gl_FragCoord origin is upper left
 0:29      Sequence
 0:29        move second child to first child ( temp 4-component vector of int)
 0:29          'r01' ( temp 4-component vector of int)
-0:29          imageLoad ( temp 4-component vector of int)
+0:29          textureFetch ( temp 4-component vector of int)
-0:29            'g_tTexbi4' (layout( rgba32i) readonly uniform iimageBuffer)
+0:29            'g_tTexbi4' (layout( rgba32i) uniform itextureBuffer)
 0:29            c1: direct index for structure ( uniform int)
 0:29              'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:29              Constant:
@@ -110,8 +110,8 @@ gl_FragCoord origin is upper left
 0:30      Sequence
 0:30        move second child to first child ( temp 4-component vector of uint)
 0:30          'r02' ( temp 4-component vector of uint)
-0:30          imageLoad ( temp 4-component vector of uint)
+0:30          textureFetch ( temp 4-component vector of uint)
-0:30            'g_tTexbu4' (layout( rgba32ui) readonly uniform uimageBuffer)
+0:30            'g_tTexbu4' (layout( rgba32ui) uniform utextureBuffer)
 0:30            c1: direct index for structure ( uniform int)
 0:30              'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:30              Constant:
@@ -155,10 +155,10 @@ gl_FragCoord origin is upper left
 0:24            Constant:
 0:24              1 (const int)
 0:?   Linker Objects
-0:?     'g_tTexbf4_test' (layout( binding=0 rgba32f) readonly uniform imageBuffer)
+0:?     'g_tTexbf4_test' (layout( binding=0 rgba32f) uniform textureBuffer)
-0:?     'g_tTexbf4' (layout( rgba32f) readonly uniform imageBuffer)
+0:?     'g_tTexbf4' (layout( rgba32f) uniform textureBuffer)
-0:?     'g_tTexbi4' (layout( rgba32i) readonly uniform iimageBuffer)
+0:?     'g_tTexbi4' (layout( rgba32i) uniform itextureBuffer)
-0:?     'g_tTexbu4' (layout( rgba32ui) readonly uniform uimageBuffer)
+0:?     'g_tTexbu4' (layout( rgba32ui) uniform utextureBuffer)
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:?     'Color' (layout( location=0) out 4-component vector of float)
 0:?     'Depth' ( out float FragDepth)
@@ -173,6 +173,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 64 68
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"
@@ -200,7 +201,6 @@ gl_FragCoord origin is upper left
                               Name 68  "Depth"
                               Name 71  "g_tTexbf4_test"
                               Decorate 16(g_tTexbf4) DescriptorSet 0
-                              Decorate 16(g_tTexbf4) NonWritable
                               MemberDecorate 22($Global) 0 Offset 0
                               MemberDecorate 22($Global) 1 Offset 8
                               MemberDecorate 22($Global) 2 Offset 16
@@ -212,14 +212,11 @@ gl_FragCoord origin is upper left
                               Decorate 22($Global) Block
                               Decorate 24 DescriptorSet 0
                               Decorate 34(g_tTexbi4) DescriptorSet 0
-                              Decorate 34(g_tTexbi4) NonWritable
                               Decorate 45(g_tTexbu4) DescriptorSet 0
-                              Decorate 45(g_tTexbu4) NonWritable
                               Decorate 64(Color) Location 0
                               Decorate 68(Depth) BuiltIn FragDepth
                               Decorate 71(g_tTexbf4_test) DescriptorSet 0
                               Decorate 71(g_tTexbf4_test) Binding 0
-                              Decorate 71(g_tTexbf4_test) NonWritable
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -227,7 +224,7 @@ gl_FragCoord origin is upper left
     8(PS_OUTPUT):             TypeStruct 7(fvec4) 6(float)
                9:             TypeFunction 8(PS_OUTPUT)
               12:             TypePointer Function 7(fvec4)
-              14:             TypeImage 6(float) Buffer nonsampled format:Rgba32f
+              14:             TypeImage 6(float) Buffer sampled format:Rgba32f
               15:             TypePointer UniformConstant 14
    16(g_tTexbf4):     15(ptr) Variable UniformConstant
               18:             TypeInt 32 1
@@ -240,13 +237,13 @@ gl_FragCoord origin is upper left
               25:     18(int) Constant 0
               26:             TypePointer Uniform 18(int)
               30:             TypePointer Function 21(ivec4)
-              32:             TypeImage 18(int) Buffer nonsampled format:Rgba32i
+              32:             TypeImage 18(int) Buffer sampled format:Rgba32i
               33:             TypePointer UniformConstant 32
    34(g_tTexbi4):     33(ptr) Variable UniformConstant
               39:             TypeInt 32 0
               40:             TypeVector 39(int) 4
               41:             TypePointer Function 40(ivec4)
-              43:             TypeImage 39(int) Buffer nonsampled format:Rgba32ui
+              43:             TypeImage 39(int) Buffer sampled format:Rgba32ui
               44:             TypePointer UniformConstant 43
    45(g_tTexbu4):     44(ptr) Variable UniformConstant
               50:             TypePointer Function 8(PS_OUTPUT)
@@ -281,17 +278,17 @@ gl_FragCoord origin is upper left
               17:          14 Load 16(g_tTexbf4)
               27:     26(ptr) AccessChain 24 25
               28:     18(int) Load 27
-              29:    7(fvec4) ImageRead 17 28
+              29:    7(fvec4) ImageFetch 17 28
                               Store 13(r00) 29
               35:          32 Load 34(g_tTexbi4)
               36:     26(ptr) AccessChain 24 25
               37:     18(int) Load 36
-              38:   21(ivec4) ImageRead 35 37
+              38:   21(ivec4) ImageFetch 35 37
                               Store 31(r01) 38
               46:          43 Load 45(g_tTexbu4)
               47:     26(ptr) AccessChain 24 25
               48:     18(int) Load 47
-              49:   40(ivec4) ImageRead 46 48
+              49:   40(ivec4) ImageFetch 46 48
                               Store 42(r02) 49
               54:     12(ptr) AccessChain 51(psout) 25
                               Store 54 53

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.buffer.float.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -9,8 +9,8 @@ gl_FragCoord origin is upper left
 0:28        move second child to first child ( temp float)
 0:28          'r00' ( temp float)
 0:28          Construct float ( temp float)
-0:?             imageLoad ( temp 4-component vector of float)
+0:?             textureFetch ( temp 4-component vector of float)
-0:28              'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:28              'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:28              c1: direct index for structure ( uniform int)
 0:28                'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:28                Constant:
@@ -19,8 +19,8 @@ gl_FragCoord origin is upper left
 0:29        move second child to first child ( temp int)
 0:29          'r01' ( temp int)
 0:29          Construct int ( temp int)
-0:?             imageLoad ( temp 4-component vector of int)
+0:?             textureFetch ( temp 4-component vector of int)
-0:29              'g_tTexbis' (layout( r32i) readonly uniform iimageBuffer)
+0:29              'g_tTexbis' (layout( r32i) uniform itextureBuffer)
 0:29              c1: direct index for structure ( uniform int)
 0:29                'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:29                Constant:
@@ -29,8 +29,8 @@ gl_FragCoord origin is upper left
 0:30        move second child to first child ( temp uint)
 0:30          'r02' ( temp uint)
 0:30          Construct uint ( temp uint)
-0:?             imageLoad ( temp 4-component vector of uint)
+0:?             textureFetch ( temp 4-component vector of uint)
-0:30              'g_tTexbus' (layout( r32ui) readonly uniform uimageBuffer)
+0:30              'g_tTexbus' (layout( r32ui) uniform utextureBuffer)
 0:30              c1: direct index for structure ( uniform int)
 0:30                'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:30                Constant:
@@ -74,10 +74,10 @@ gl_FragCoord origin is upper left
 0:24            Constant:
 0:24              1 (const int)
 0:?   Linker Objects
-0:?     'g_tTexbfs_test' (layout( binding=0 r32f) readonly uniform imageBuffer)
+0:?     'g_tTexbfs_test' (layout( binding=0 r32f) uniform textureBuffer)
-0:?     'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:?     'g_tTexbfs' (layout( r32f) uniform textureBuffer)
-0:?     'g_tTexbis' (layout( r32i) readonly uniform iimageBuffer)
+0:?     'g_tTexbis' (layout( r32i) uniform itextureBuffer)
-0:?     'g_tTexbus' (layout( r32ui) readonly uniform uimageBuffer)
+0:?     'g_tTexbus' (layout( r32ui) uniform utextureBuffer)
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:?     'Color' (layout( location=0) out 4-component vector of float)
 0:?     'Depth' ( out float FragDepth)
@@ -86,7 +86,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:24  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -96,8 +96,8 @@ gl_FragCoord origin is upper left
 0:28        move second child to first child ( temp float)
 0:28          'r00' ( temp float)
 0:28          Construct float ( temp float)
-0:?             imageLoad ( temp 4-component vector of float)
+0:?             textureFetch ( temp 4-component vector of float)
-0:28              'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:28              'g_tTexbfs' (layout( r32f) uniform textureBuffer)
 0:28              c1: direct index for structure ( uniform int)
 0:28                'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:28                Constant:
@@ -106,8 +106,8 @@ gl_FragCoord origin is upper left
 0:29        move second child to first child ( temp int)
 0:29          'r01' ( temp int)
 0:29          Construct int ( temp int)
-0:?             imageLoad ( temp 4-component vector of int)
+0:?             textureFetch ( temp 4-component vector of int)
-0:29              'g_tTexbis' (layout( r32i) readonly uniform iimageBuffer)
+0:29              'g_tTexbis' (layout( r32i) uniform itextureBuffer)
 0:29              c1: direct index for structure ( uniform int)
 0:29                'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:29                Constant:
@@ -116,8 +116,8 @@ gl_FragCoord origin is upper left
 0:30        move second child to first child ( temp uint)
 0:30          'r02' ( temp uint)
 0:30          Construct uint ( temp uint)
-0:?             imageLoad ( temp 4-component vector of uint)
+0:?             textureFetch ( temp 4-component vector of uint)
-0:30              'g_tTexbus' (layout( r32ui) readonly uniform uimageBuffer)
+0:30              'g_tTexbus' (layout( r32ui) uniform utextureBuffer)
 0:30              c1: direct index for structure ( uniform int)
 0:30                'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:30                Constant:
@@ -161,10 +161,10 @@ gl_FragCoord origin is upper left
 0:24            Constant:
 0:24              1 (const int)
 0:?   Linker Objects
-0:?     'g_tTexbfs_test' (layout( binding=0 r32f) readonly uniform imageBuffer)
+0:?     'g_tTexbfs_test' (layout( binding=0 r32f) uniform textureBuffer)
-0:?     'g_tTexbfs' (layout( r32f) readonly uniform imageBuffer)
+0:?     'g_tTexbfs' (layout( r32f) uniform textureBuffer)
-0:?     'g_tTexbis' (layout( r32i) readonly uniform iimageBuffer)
+0:?     'g_tTexbis' (layout( r32i) uniform itextureBuffer)
-0:?     'g_tTexbus' (layout( r32ui) readonly uniform uimageBuffer)
+0:?     'g_tTexbus' (layout( r32ui) uniform utextureBuffer)
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 0:?     'Color' (layout( location=0) out 4-component vector of float)
 0:?     'Depth' ( out float FragDepth)
@@ -179,6 +179,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 67 71
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"
@@ -206,7 +207,6 @@ gl_FragCoord origin is upper left
                               Name 71  "Depth"
                               Name 74  "g_tTexbfs_test"
                               Decorate 16(g_tTexbfs) DescriptorSet 0
-                              Decorate 16(g_tTexbfs) NonWritable
                               MemberDecorate 22($Global) 0 Offset 0
                               MemberDecorate 22($Global) 1 Offset 8
                               MemberDecorate 22($Global) 2 Offset 16
@@ -218,14 +218,11 @@ gl_FragCoord origin is upper left
                               Decorate 22($Global) Block
                               Decorate 24 DescriptorSet 0
                               Decorate 35(g_tTexbis) DescriptorSet 0
-                              Decorate 35(g_tTexbis) NonWritable
                               Decorate 46(g_tTexbus) DescriptorSet 0
-                              Decorate 46(g_tTexbus) NonWritable
                               Decorate 67(Color) Location 0
                               Decorate 71(Depth) BuiltIn FragDepth
                               Decorate 74(g_tTexbfs_test) DescriptorSet 0
                               Decorate 74(g_tTexbfs_test) Binding 0
-                              Decorate 74(g_tTexbfs_test) NonWritable
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -233,7 +230,7 @@ gl_FragCoord origin is upper left
     8(PS_OUTPUT):             TypeStruct 7(fvec4) 6(float)
                9:             TypeFunction 8(PS_OUTPUT)
               12:             TypePointer Function 6(float)
-              14:             TypeImage 6(float) Buffer nonsampled format:R32f
+              14:             TypeImage 6(float) Buffer sampled format:R32f
               15:             TypePointer UniformConstant 14
    16(g_tTexbfs):     15(ptr) Variable UniformConstant
               18:             TypeInt 32 1
@@ -246,12 +243,12 @@ gl_FragCoord origin is upper left
               25:     18(int) Constant 0
               26:             TypePointer Uniform 18(int)
               31:             TypePointer Function 18(int)
-              33:             TypeImage 18(int) Buffer nonsampled format:R32i
+              33:             TypeImage 18(int) Buffer sampled format:R32i
               34:             TypePointer UniformConstant 33
    35(g_tTexbis):     34(ptr) Variable UniformConstant
               41:             TypeInt 32 0
               42:             TypePointer Function 41(int)
-              44:             TypeImage 41(int) Buffer nonsampled format:R32ui
+              44:             TypeImage 41(int) Buffer sampled format:R32ui
               45:             TypePointer UniformConstant 44
    46(g_tTexbus):     45(ptr) Variable UniformConstant
               50:             TypeVector 41(int) 4
@@ -287,19 +284,19 @@ gl_FragCoord origin is upper left
               17:          14 Load 16(g_tTexbfs)
               27:     26(ptr) AccessChain 24 25
               28:     18(int) Load 27
-              29:    7(fvec4) ImageRead 17 28
+              29:    7(fvec4) ImageFetch 17 28
               30:    6(float) CompositeExtract 29 0
                               Store 13(r00) 30
               36:          33 Load 35(g_tTexbis)
               37:     26(ptr) AccessChain 24 25
               38:     18(int) Load 37
-              39:   21(ivec4) ImageRead 36 38
+              39:   21(ivec4) ImageFetch 36 38
               40:     18(int) CompositeExtract 39 0
                               Store 32(r01) 40
               47:          44 Load 46(g_tTexbus)
               48:     26(ptr) AccessChain 24 25
               49:     18(int) Load 48
-              51:   50(ivec4) ImageRead 47 49
+              51:   50(ivec4) ImageFetch 47 49
               52:     41(int) CompositeExtract 51 0
                               Store 43(r02) 52
               58:     57(ptr) AccessChain 54(psout) 25

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.offset.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.offset.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:48  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -281,7 +281,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:48  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -571,6 +571,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 155 159
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.offsetarray.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:48  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -218,7 +218,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:48  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -445,6 +445,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 119 123
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.rwbuffer.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:22  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -56,7 +56,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:22  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -119,6 +119,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 54
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.rwtexture.array.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:40  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -104,7 +104,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:40  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -215,6 +215,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 82 86
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out

@@ -1,5 +1,5 @@
 hlsl.load.rwtexture.dx10.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:40  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -122,7 +122,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:40  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color,  temp float Depth})
@@ -251,6 +251,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 104 108
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.logical.binary.frag.out

@@ -1,5 +1,5 @@
 hlsl.logical.binary.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:12  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -65,7 +65,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:12  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -136,6 +136,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 59
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.logical.binary.vec.frag.out

@@ -1,5 +1,5 @@
 hlsl.logical.binary.vec.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:10  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -128,7 +128,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:10  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -262,6 +262,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 117
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.logical.unary.frag.out

@@ -1,5 +1,5 @@
 hlsl.logical.unary.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:12  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -31,6 +31,7 @@ gl_FragCoord origin is upper left
 0:17              3 (const uint)
 0:19      Test condition and select ( temp void)
 0:19        Condition
+0:19        Convert int to bool ( temp bool)
 0:19          ival: direct index for structure ( uniform int)
 0:19            'anon@0' (layout( row_major std140) uniform block{ uniform int ival,  uniform 4-component vector of int ival4,  uniform float fval,  uniform 4-component vector of float fval4})
 0:19            Constant:
@@ -38,6 +39,7 @@ gl_FragCoord origin is upper left
 0:19        true case is null
 0:20      Test condition and select ( temp void)
 0:20        Condition
+0:20        Convert float to bool ( temp bool)
 0:20          fval: direct index for structure ( uniform float)
 0:20            'anon@0' (layout( row_major std140) uniform block{ uniform int ival,  uniform 4-component vector of int ival4,  uniform float fval,  uniform 4-component vector of float fval4})
 0:20            Constant:
@@ -91,7 +93,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:12  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -123,6 +125,7 @@ gl_FragCoord origin is upper left
 0:17              3 (const uint)
 0:19      Test condition and select ( temp void)
 0:19        Condition
+0:19        Convert int to bool ( temp bool)
 0:19          ival: direct index for structure ( uniform int)
 0:19            'anon@0' (layout( row_major std140) uniform block{ uniform int ival,  uniform 4-component vector of int ival4,  uniform float fval,  uniform 4-component vector of float fval4})
 0:19            Constant:
@@ -130,6 +133,7 @@ gl_FragCoord origin is upper left
 0:19        true case is null
 0:20      Test condition and select ( temp void)
 0:20        Condition
+0:20        Convert float to bool ( temp bool)
 0:20          fval: direct index for structure ( uniform float)
 0:20            'anon@0' (layout( row_major std140) uniform block{ uniform int ival,  uniform 4-component vector of int ival4,  uniform float fval,  uniform 4-component vector of float fval4})
 0:20            Constant:
@@ -181,13 +185,14 @@ gl_FragCoord origin is upper left
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 82
+// Id's are bound by 84
 
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 79
+                              EntryPoint Fragment 4  "main" 81
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"
@@ -198,15 +203,15 @@ gl_FragCoord origin is upper left
                               MemberName 14($Global) 2  "fval"
                               MemberName 14($Global) 3  "fval4"
                               Name 16  ""
-                              Name 70  "psout"
+                              Name 72  "psout"
-                              Name 79  "Color"
+                              Name 81  "Color"
                               MemberDecorate 14($Global) 0 Offset 0
                               MemberDecorate 14($Global) 1 Offset 16
                               MemberDecorate 14($Global) 2 Offset 32
                               MemberDecorate 14($Global) 3 Offset 48
                               Decorate 14($Global) Block
                               Decorate 16 DescriptorSet 0
-                              Decorate 79(Color) Location 0
+                              Decorate 81(Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -234,22 +239,22 @@ gl_FragCoord origin is upper left
               42:     12(int) Constant 3
               43:             TypePointer Uniform 7(fvec4)
               46:    7(fvec4) ConstantComposite 39 39 39 39
-              69:             TypePointer Function 8(PS_OUTPUT)
+              71:             TypePointer Function 8(PS_OUTPUT)
-              71:    6(float) Constant 1065353216
+              73:    6(float) Constant 1065353216
-              72:    7(fvec4) ConstantComposite 71 71 71 71
+              74:    7(fvec4) ConstantComposite 73 73 73 73
-              73:             TypePointer Function 7(fvec4)
+              75:             TypePointer Function 7(fvec4)
-              78:             TypePointer Output 7(fvec4)
+              80:             TypePointer Output 7(fvec4)
-       79(Color):     78(ptr) Variable Output
+       81(Color):     80(ptr) Variable Output
          4(main):           2 Function None 3
                5:             Label
-              80:8(PS_OUTPUT) FunctionCall 10(@main()
+              82:8(PS_OUTPUT) FunctionCall 10(@main()
-              81:    7(fvec4) CompositeExtract 80 0
+              83:    7(fvec4) CompositeExtract 82 0
-                              Store 79(Color) 81
+                              Store 81(Color) 83
                               Return
                               FunctionEnd
       10(@main():8(PS_OUTPUT) Function None 9
               11:             Label
-       70(psout):     69(ptr) Variable Function
+       72(psout):     71(ptr) Variable Function
               19:     18(ptr) AccessChain 16 17
               20:     12(int) Load 19
               24:    21(bool) INotEqual 20 23
@@ -268,38 +273,40 @@ gl_FragCoord origin is upper left
               48:   30(bvec4) LogicalNot 47
               49:     18(ptr) AccessChain 16 17
               50:     12(int) Load 49
-                              SelectionMerge 52 None
+              51:    21(bool) INotEqual 50 23
-                              BranchConditional 50 51 52
+                              SelectionMerge 53 None
-              51:               Label
+                              BranchConditional 51 52 53
-                                Branch 52
               52:               Label
-              53:     36(ptr) AccessChain 16 35
+                                Branch 53
-              54:    6(float) Load 53
+              53:             Label
-                              SelectionMerge 56 None
+              54:     36(ptr) AccessChain 16 35
-                              BranchConditional 54 55 56
+              55:    6(float) Load 54
-              55:               Label
+              56:    21(bool) FOrdNotEqual 55 39
-                                Branch 56
+                              SelectionMerge 58 None
-              56:             Label
+                              BranchConditional 56 57 58
-              57:     18(ptr) AccessChain 16 17
+              57:               Label
-              58:     12(int) Load 57
+                                Branch 58
-              59:    21(bool) INotEqual 58 23
+              58:             Label
-              60:    21(bool) LogicalNot 59
+              59:     18(ptr) AccessChain 16 17
-                              SelectionMerge 62 None
+              60:     12(int) Load 59
-                              BranchConditional 60 61 62
+              61:    21(bool) INotEqual 60 23
-              61:               Label
+              62:    21(bool) LogicalNot 61
-                                Branch 62
+                              SelectionMerge 64 None
-              62:             Label
+                              BranchConditional 62 63 64
-              63:     36(ptr) AccessChain 16 35
+              63:               Label
-              64:    6(float) Load 63
+                                Branch 64
-              65:    21(bool) FOrdNotEqual 64 39
+              64:             Label
-              66:    21(bool) LogicalNot 65
+              65:     36(ptr) AccessChain 16 35
-                              SelectionMerge 68 None
+              66:    6(float) Load 65
-                              BranchConditional 66 67 68
+              67:    21(bool) FOrdNotEqual 66 39
-              67:               Label
+              68:    21(bool) LogicalNot 67
-                                Branch 68
+                              SelectionMerge 70 None
-              68:             Label
+                              BranchConditional 68 69 70
-              74:     73(ptr) AccessChain 70(psout) 17
+              69:               Label
-                              Store 74 72
+                                Branch 70
-              75:8(PS_OUTPUT) Load 70(psout)
+              70:             Label
-                              ReturnValue 75
+              76:     75(ptr) AccessChain 72(psout) 17
+                              Store 76 74
+              77:8(PS_OUTPUT) Load 72(psout)
+                              ReturnValue 77
                               FunctionEnd

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.matNx1.frag.out

@@ -1,5 +1,5 @@
 hlsl.matNx1.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: TestMatNx1( ( temp void)
@@ -77,7 +77,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: TestMatNx1( ( temp void)
@@ -160,6 +160,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 74
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 6  "TestMatNx1("
                               Name 10  "PS_OUTPUT"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.matType.bool.frag.out

@@ -1,5 +1,5 @@
 hlsl.matType.bool.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: TestBoolMatTypes( ( temp void)
@@ -117,7 +117,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: TestBoolMatTypes( ( temp void)
@@ -240,6 +240,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 127
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 6  "TestBoolMatTypes("
                               Name 10  "PS_OUTPUT"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.matType.frag.out

@@ -1,5 +1,5 @@
 hlsl.matType.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:9  Function Definition: ShaderFunction(vf1;f1; ( temp 1-component vector of float)
@@ -17,7 +17,7 @@ Linked fragment stage:
 
 WARNING: Linking fragment stage: Entry point not found
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:9  Function Definition: ShaderFunction(vf1;f1; ( temp 1-component vector of float)
@@ -40,6 +40,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction"
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 11  "ShaderFunction(vf1;f1;"
                               Name 9  "inFloat1"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.matType.int.frag.out

@@ -1,5 +1,5 @@
 hlsl.matType.int.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: TestIntMatTypes( ( temp void)
@@ -200,7 +200,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:3  Function Definition: TestIntMatTypes( ( temp void)
@@ -406,6 +406,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 229
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 6  "TestIntMatTypes("
                               Name 8  "TestUintMatTypes("

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.matrixSwizzle.vert.out

@@ -1,5 +1,5 @@
 hlsl.matrixSwizzle.vert
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:2  Function Definition: @ShaderFunction(f1; ( temp void)
 0:2    Function Parameters: 
@@ -339,7 +339,7 @@ Shader version: 450
 Linked vertex stage:
 
 
-Shader version: 450
+Shader version: 500
 0:? Sequence
 0:2  Function Definition: @ShaderFunction(f1; ( temp void)
 0:2    Function Parameters: 
@@ -684,6 +684,7 @@ Missing functionality: matrix swizzle
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Vertex 4  "ShaderFunction" 81
+                              Source HLSL 500
                               Name 4  "ShaderFunction"
                               Name 10  "@ShaderFunction(f1;"
                               Name 9  "inf"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.matrixindex.frag.out

@@ -1,5 +1,5 @@
 hlsl.matrixindex.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:10  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -137,7 +137,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:10  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -280,6 +280,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 80
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.max.frag.out

@@ -1,5 +1,5 @@
 hlsl.max.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4;vf4; ( temp 4-component vector of float)
@@ -34,7 +34,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:2  Function Definition: @PixelShaderFunction(vf4;vf4; ( temp 4-component vector of float)
@@ -74,6 +74,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "PixelShaderFunction" 21 24 27
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "PixelShaderFunction"
                               Name 12  "@PixelShaderFunction(vf4;vf4;"
                               Name 10  "input1"

3rdparty/bgfx/3rdparty/glslang/Test/baseResults/hlsl.mintypes.frag.out

@@ -1,5 +1,5 @@
 hlsl.mintypes.frag
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:9  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -50,7 +50,7 @@ gl_FragCoord origin is upper left
 Linked fragment stage:
 
 
-Shader version: 450
+Shader version: 500
 gl_FragCoord origin is upper left
 0:? Sequence
 0:9  Function Definition: @main( ( temp structure{ temp 4-component vector of float Color})
@@ -106,6 +106,7 @@ gl_FragCoord origin is upper left
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 4  "main" 64
                               ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
                               MemberName 8(PS_OUTPUT) 0  "Color"