Merge branch 'master' into GL_EXT_blend_func_extended

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

diff --cc glslang/MachineIndependent/Versions.cpp
index 30313b2,74da4eb..143f251
--- 1/glslang/MachineIndependent/Versions.cpp
--- 2/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@@ -306,7 -306,7 +306,8 @@@ void TParseVersions::initializeExtensio
      extensionBehavior[E_GL_EXT_ray_tracing]                 = EBhDisable;
      extensionBehavior[E_GL_EXT_ray_query]                   = EBhDisable;
      extensionBehavior[E_GL_EXT_ray_flags_primitive_culling] = EBhDisable;
 +    extensionBehavior[E_GL_EXT_blend_func_extended]         = EBhDisable;
+     extensionBehavior[E_GL_EXT_shader_implicit_conversions] = EBhDisable;
  
      // OVR extensions
      extensionBehavior[E_GL_OVR_multiview]                = EBhDisable;
@@@ -365,8 -365,8 +366,9 @@@ void TParseVersions::getPreamble(std::s
              "#define GL_EXT_tessellation_point_size 1\n"
              "#define GL_EXT_texture_buffer 1\n"
              "#define GL_EXT_texture_cube_map_array 1\n"
+             "#define GL_EXT_shader_implicit_conversions 1\n"
              "#define GL_EXT_shader_integer_mix 1\n"
 +            "#define GL_EXT_blend_func_extended 1\n"
  
              // OES matching AEP
              "#define GL_OES_geometry_shader 1\n"

diff --cc glslang/MachineIndependent/Versions.h
index cde6c23,35524e9..8667411
--- 1/glslang/MachineIndependent/Versions.h
--- 2/glslang/MachineIndependent/Versions.h
+++ b/glslang/MachineIndependent/Versions.h
@@@ -196,7 -196,7 +196,8 @@@ const char* const E_GL_EXT_debug_print
  const char* const E_GL_EXT_ray_tracing                      = "GL_EXT_ray_tracing";
  const char* const E_GL_EXT_ray_query                        = "GL_EXT_ray_query";
  const char* const E_GL_EXT_ray_flags_primitive_culling      = "GL_EXT_ray_flags_primitive_culling";
 +const char* const E_GL_EXT_blend_func_extended              = "GL_EXT_blend_func_extended";
+ const char* const E_GL_EXT_shader_implicit_conversions      = "GL_EXT_shader_implicit_conversions";
  
  // Arrays of extensions for the above viewportEXTs duplications