Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I142827f614df0a28400993f62f5bea8bb45f9202

diff --cc android/cts/master/vk-master.txt
index 7be7775,21485e4..4b1efcf
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@@ -522256,14 -464750,12 +522256,17 @@@ dEQP-VK.graphicsfuzz.matrices-and-retur
  dEQP-VK.graphicsfuzz.nested-ifs-and-return-in-for-loop
  dEQP-VK.graphicsfuzz.pow-vec4
  dEQP-VK.graphicsfuzz.return-in-loop-in-function
+ dEQP-VK.graphicsfuzz.struct-used-as-temporary
  dEQP-VK.graphicsfuzz.swizzle-struct-init-min
+ dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops
  dEQP-VK.graphicsfuzz.unreachable-loops-in-switch
  dEQP-VK.graphicsfuzz.while-inside-switch
+ dEQP-VK.graphicsfuzz.write-red-after-search
 +dEQP-VK.imageless_framebuffer.color
 +dEQP-VK.imageless_framebuffer.depth_stencil
 +dEQP-VK.imageless_framebuffer.color_resolve
 +dEQP-VK.imageless_framebuffer.depth_stencil_resolve
 +dEQP-VK.imageless_framebuffer.multisubpass
  dEQP-VK.transform_feedback.simple.basic_1_256
  dEQP-VK.transform_feedback.simple.basic_beginqueryindexed_streamid_0_1_256
  dEQP-VK.transform_feedback.simple.basic_endqueryindexed_streamid_0_1_256

diff --cc external/fetch_sources.py
index 853d9f5,412cecf..2da4ce3
--- 1/external/fetch_sources.py
--- 2/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@@ -316,12 -316,12 +316,12 @@@ PACKAGES = 
        GitRepo(
                "https://github.com/KhronosGroup/SPIRV-Tools.git",
                None,
-               "9559cdbdf011c487f67f89e2d694bd4a18d5c1e0",
+               "1eb89172a82b436d8037e8a8c29c80f7e1f7df74",
                "spirv-tools"),
        GitRepo(
 -              "https://github.com/KhronosGroup/glslang.git",
 -              None,
 -              "c538b5d796fb24dd418fdd650c7f76e56bcc3dd8",
 +              "https://gitlab.khronos.org/GLSL/glslang.git",
 +              "git@gitlab.khronos.org:GLSL/glslang.git",
 +              "fe333589aaeb286512d4f9ce90b27fa8db783c96",
                "glslang",
                removeTags = ["master-tot"]),
        GitRepo(

diff --cc external/vulkancts/mustpass/master/vk-default-no-waivers.txt
index 3a849f7,5c3c151..ac27cf7
--- 1/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
--- 2/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
@@@ -524402,14 -466896,12 +524402,17 @@@ dEQP-VK.graphicsfuzz.matrices-and-retur
  dEQP-VK.graphicsfuzz.nested-ifs-and-return-in-for-loop
  dEQP-VK.graphicsfuzz.pow-vec4
  dEQP-VK.graphicsfuzz.return-in-loop-in-function
+ dEQP-VK.graphicsfuzz.struct-used-as-temporary
  dEQP-VK.graphicsfuzz.swizzle-struct-init-min
+ dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops
  dEQP-VK.graphicsfuzz.unreachable-loops-in-switch
  dEQP-VK.graphicsfuzz.while-inside-switch
+ dEQP-VK.graphicsfuzz.write-red-after-search
 +dEQP-VK.imageless_framebuffer.color
 +dEQP-VK.imageless_framebuffer.depth_stencil
 +dEQP-VK.imageless_framebuffer.color_resolve
 +dEQP-VK.imageless_framebuffer.depth_stencil_resolve
 +dEQP-VK.imageless_framebuffer.multisubpass
  dEQP-VK.transform_feedback.simple.basic_1_256
  dEQP-VK.transform_feedback.simple.basic_beginqueryindexed_streamid_0_1_256
  dEQP-VK.transform_feedback.simple.basic_endqueryindexed_streamid_0_1_256

diff --cc external/vulkancts/mustpass/master/vk-default.txt
index 73eb52e,8a64fda..1a098a4
--- 1/external/vulkancts/mustpass/master/vk-default.txt
--- 2/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@@ -524249,14 -466743,12 +524249,17 @@@ dEQP-VK.graphicsfuzz.matrices-and-retur
  dEQP-VK.graphicsfuzz.nested-ifs-and-return-in-for-loop
  dEQP-VK.graphicsfuzz.pow-vec4
  dEQP-VK.graphicsfuzz.return-in-loop-in-function
+ dEQP-VK.graphicsfuzz.struct-used-as-temporary
  dEQP-VK.graphicsfuzz.swizzle-struct-init-min
+ dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops
  dEQP-VK.graphicsfuzz.unreachable-loops-in-switch
  dEQP-VK.graphicsfuzz.while-inside-switch
+ dEQP-VK.graphicsfuzz.write-red-after-search
 +dEQP-VK.imageless_framebuffer.color
 +dEQP-VK.imageless_framebuffer.depth_stencil
 +dEQP-VK.imageless_framebuffer.color_resolve
 +dEQP-VK.imageless_framebuffer.depth_stencil_resolve
 +dEQP-VK.imageless_framebuffer.multisubpass
  dEQP-VK.transform_feedback.simple.basic_1_256
  dEQP-VK.transform_feedback.simple.basic_beginqueryindexed_streamid_0_1_256
  dEQP-VK.transform_feedback.simple.basic_endqueryindexed_streamid_0_1_256