Merge vk-gl-cts/github-master into vk-gl-cts/master

Change-Id: I228e2d537618b1c9b6b0cd631bd0fd1f8db13d82

diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl44-master.txt
index b570572,b570572..f5d4e98
--- 1/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl44-master.txt
--- 2/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl44-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl44-master.txt
@@@ -8050,6 -8050,6 +8050,8 @@@ KHR-GL44.enhanced_layouts.xfb_block_str
  KHR-GL44.enhanced_layouts.xfb_override_qualifiers_with_api
  KHR-GL44.enhanced_layouts.xfb_vertex_streams
  KHR-GL44.enhanced_layouts.xfb_global_buffer
++KHR-GL44.enhanced_layouts.xfb_explicit_location
++KHR-GL44.enhanced_layouts.xfb_struct_explicit_location
  KHR-GL44.enhanced_layouts.fragment_data_location_api
  KHR-GL44.enhanced_layouts.varying_location_limit
  KHR-GL44.enhanced_layouts.varying_components

diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl45-master.txt
index e2d5d15,e2d5d15..4c0bd36
--- 1/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl45-master.txt
--- 2/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl45-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl45-master.txt
@@@ -8051,6 -8051,6 +8051,8 @@@ KHR-GL45.enhanced_layouts.xfb_block_str
  KHR-GL45.enhanced_layouts.xfb_override_qualifiers_with_api
  KHR-GL45.enhanced_layouts.xfb_vertex_streams
  KHR-GL45.enhanced_layouts.xfb_global_buffer
++KHR-GL45.enhanced_layouts.xfb_explicit_location
++KHR-GL45.enhanced_layouts.xfb_struct_explicit_location
  KHR-GL45.enhanced_layouts.fragment_data_location_api
  KHR-GL45.enhanced_layouts.varying_location_limit
  KHR-GL45.enhanced_layouts.varying_components

diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt
index 3cb57bd,3cb57bd..85faa9f
--- 1/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt
--- 2/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt
@@@ -8051,6 -8051,6 +8051,8 @@@ KHR-GL46.enhanced_layouts.xfb_block_str
  KHR-GL46.enhanced_layouts.xfb_override_qualifiers_with_api
  KHR-GL46.enhanced_layouts.xfb_vertex_streams
  KHR-GL46.enhanced_layouts.xfb_global_buffer
++KHR-GL46.enhanced_layouts.xfb_explicit_location
++KHR-GL46.enhanced_layouts.xfb_struct_explicit_location
  KHR-GL46.enhanced_layouts.fragment_data_location_api
  KHR-GL46.enhanced_layouts.varying_location_limit
  KHR-GL46.enhanced_layouts.varying_components