Merge branch 'master' into ARB_uniform_buffer_object

diff --cc glslang/MachineIndependent/ParseHelper.cpp
Simple merge

diff --cc glslang/MachineIndependent/Versions.cpp
index e3be937,7c68230..23f7423
--- 1/glslang/MachineIndependent/Versions.cpp
--- 2/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@@ -192,7 -193,7 +193,8 @@@ void TParseVersions::initializeExtensio
      extensionBehavior[E_GL_ARB_shader_viewport_layer_array]  = EBhDisable;
      extensionBehavior[E_GL_ARB_fragment_shader_interlock]    = EBhDisable;
      extensionBehavior[E_GL_ARB_shader_clock]                 = EBhDisable;
 +    extensionBehavior[E_GL_ARB_uniform_buffer_object]        = EBhDisable;
+     extensionBehavior[E_GL_ARB_sample_shading]               = EBhDisable;
  
      extensionBehavior[E_GL_KHR_shader_subgroup_basic]            = EBhDisable;
      extensionBehavior[E_GL_KHR_shader_subgroup_vote]             = EBhDisable;

diff --cc glslang/MachineIndependent/Versions.h
index 4e189c1,6d8365f..d319a2d
--- 1/glslang/MachineIndependent/Versions.h
--- 2/glslang/MachineIndependent/Versions.h
+++ b/glslang/MachineIndependent/Versions.h
@@@ -144,7 -145,7 +145,8 @@@ const char* const E_GL_ARB_post_depth_c
  const char* const E_GL_ARB_shader_viewport_layer_array  = "GL_ARB_shader_viewport_layer_array";
  const char* const E_GL_ARB_fragment_shader_interlock    = "GL_ARB_fragment_shader_interlock";
  const char* const E_GL_ARB_shader_clock                 = "GL_ARB_shader_clock";
 +const char* const E_GL_ARB_uniform_buffer_object        = "GL_ARB_uniform_buffer_object";
+ const char* const E_GL_ARB_sample_shading               = "GL_ARB_sample_shading";
  
  const char* const E_GL_KHR_shader_subgroup_basic            = "GL_KHR_shader_subgroup_basic";
  const char* const E_GL_KHR_shader_subgroup_vote             = "GL_KHR_shader_subgroup_vote";