Update glslang source files, update static constant names am: 382ab0f058 am: fec7de9530 am: 8f20f16454

Original change: https://android-review.googlesource.com/c/platform/external/vulkan-validation-layers/+/1371833

Change-Id: I1001fcddc5bc1c187ed2d2bac2c6a171a9a29b9a

2 files changed, 11 insertions, 6 deletions

diff --git a/build-android/build.py b/build-android/build.py
index 7b4d3d32a..80a3f166e 100755
--- a/build-android/build.py
+++ b/build-android/build.py
@@ -204,12 +204,17 @@ def main():
           'dest_dir': 'third_party/shaderc/third_party/glslang',
           'files': ['glslang/OSDependent/osinclude.h',
                     'Android.mk',
+                    # Build version info is generated frmo the CHANGES.md file.
+                    'CHANGES.md',
+                    'build_info.h.tmpl',
+                    'build_info.py',
                    ],
           'dirs': [
               'SPIRV',
               'OGLCompilersDLL',
               'glslang/GenericCodeGen',
               'hlsl',
+              'glslang/HLSL',
               'glslang/Include',
               'glslang/MachineIndependent',
               'glslang/OSDependent/Unix',
diff --git a/layers/gpu_validation.cpp b/layers/gpu_validation.cpp
index 38737a956..c8c3168bb 100644
--- a/layers/gpu_validation.cpp
+++ b/layers/gpu_validation.cpp
@@ -730,10 +730,10 @@ static void GenerateStageMessage(const uint32_t *debug_record, std::string &msg)
                  << " Instance Index = " << debug_record[kInstVertOutInstanceIndex] << ". ";
         } break;
         case spv::ExecutionModelTessellationControl: {
-            strm << "Stage = Tessellation Control.  Invocation ID = " << debug_record[kInstTessOutInvocationId] << ". ";
+            strm << "Stage = Tessellation Control.  Invocation ID = " << debug_record[kInstTessCtlOutInvocationId] << ". ";
         } break;
         case spv::ExecutionModelTessellationEvaluation: {
-            strm << "Stage = Tessellation Eval.  Invocation ID = " << debug_record[kInstTessOutInvocationId] << ". ";
+            strm << "Stage = Tessellation Eval.  Invocation ID = " << debug_record[kInstTessCtlOutInvocationId] << ". ";
         } break;
         case spv::ExecutionModelGeometry: {
             strm << "Stage = Geometry.  Primitive ID = " << debug_record[kInstGeomOutPrimitiveId]
@@ -745,7 +745,7 @@ static void GenerateStageMessage(const uint32_t *debug_record, std::string &msg)
                  << *reinterpret_cast<const float *>(&debug_record[kInstFragOutFragCoordY]) << "). ";
         } break;
         case spv::ExecutionModelGLCompute: {
-            strm << "Stage = Compute.  Global invocation ID = " << debug_record[kInstCompOutGlobalInvocationId] << ". ";
+            strm << "Stage = Compute.  Global invocation ID = " << debug_record[kInstCompOutGlobalInvocationIdX] << ". ";
         } break;
         case spv::ExecutionModelRayGenerationNV: {
             strm << "Stage = Ray Generation.  Global Launch ID (x,y,z) = (" << debug_record[kInstRayTracingOutLaunchIdX] << ", "
@@ -785,12 +785,12 @@ static void GenerateValidationMessage(const uint32_t *debug_record, std::string
     std::ostringstream strm;
     switch (debug_record[kInstValidationOutError]) {
         case 0: {
-            strm << "Index of " << debug_record[kInstBindlessOutDescIndex] << " used to index descriptor array of length "
-                 << debug_record[kInstBindlessOutDescBound] << ". ";
+            strm << "Index of " << debug_record[kInstBindlessBoundsOutDescIndex] << " used to index descriptor array of length "
+                 << debug_record[kInstBindlessBoundsOutDescBound] << ". ";
             vuid_msg = "UNASSIGNED-Descriptor index out of bounds";
         } break;
         case 1: {
-            strm << "Descriptor index " << debug_record[kInstBindlessOutDescIndex] << " is uninitialized. ";
+            strm << "Descriptor index " << debug_record[kInstBindlessBoundsOutDescIndex] << " is uninitialized. ";
             vuid_msg = "UNASSIGNED-Descriptor uninitialized";
         } break;
         default: {