diff --git a/tests/regres/testlists/vk-master-ASSERT.txt b/tests/regres/testlists/vk-master-ASSERT.txt
index c7f3307..e69de29 100644
--- a/tests/regres/testlists/vk-master-ASSERT.txt
+++ b/tests/regres/testlists/vk-master-ASSERT.txt
@@ -1,144 +0,0 @@
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_explicit_lod.sampled_image.optypeimage_mismatch.rgba32ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler.optypeimage_mismatch.rgba32ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_descriptors.optypeimage_mismatch.rgba32ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.combined_image_sampler_separate_variables.optypeimage_mismatch.rgba32ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba16ui.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32f.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32f.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32f.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32i.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32i.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32i.depth_property.unknown.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32ui.depth_property.depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32ui.depth_property.non_depth.shader_frag
-dEQP-VK.spirv_assembly.instruction.graphics.image_sampler.imagesample_dref_implicit_lod.sampled_image.optypeimage_mismatch.rgba32ui.depth_property.unknown.shader_frag
diff --git a/tests/regres/testlists/vk-master-FAIL.txt b/tests/regres/testlists/vk-master-FAIL.txt
index e6187d4..e69de29 100644
--- a/tests/regres/testlists/vk-master-FAIL.txt
+++ b/tests/regres/testlists/vk-master-FAIL.txt
@@ -1 +0,0 @@
-dEQP-VK.pipeline.fast_linked_library.creation_feedback.graphics_tests.vertex_stage_fragment_stage_no_cache_zero_out_feedback_cout
diff --git a/tests/regres/testlists/vk-master-NOT_SUPPORTED.txt b/tests/regres/testlists/vk-master-NOT_SUPPORTED.txt
index 88d7c86..c6670fb 100644
--- a/tests/regres/testlists/vk-master-NOT_SUPPORTED.txt
+++ b/tests/regres/testlists/vk-master-NOT_SUPPORTED.txt
Binary files differ
diff --git a/tests/regres/testlists/vk-master-PASS.txt b/tests/regres/testlists/vk-master-PASS.txt
index 66431d0..ccf8fa9 100644
--- a/tests/regres/testlists/vk-master-PASS.txt
+++ b/tests/regres/testlists/vk-master-PASS.txt
Binary files differ
diff --git a/tests/regres/testlists/vk-wsi-NOT_SUPPORTED.txt b/tests/regres/testlists/vk-wsi-NOT_SUPPORTED.txt
index 0ccd79c..90672b9 100644
--- a/tests/regres/testlists/vk-wsi-NOT_SUPPORTED.txt
+++ b/tests/regres/testlists/vk-wsi-NOT_SUPPORTED.txt
@@ -4971,8 +4971,6 @@
 dEQP-VK.wsi.xcb.shared_presentable_image.scale_none.rotate_90.post_multiplied.demand
 dEQP-VK.wsi.xcb.shared_presentable_image.scale_none.rotate_90.pre_multiplied.continuous
 dEQP-VK.wsi.xcb.shared_presentable_image.scale_none.rotate_90.pre_multiplied.demand
-dEQP-VK.wsi.xcb.surface.query_capabilities2
-dEQP-VK.wsi.xcb.surface.query_formats2
 dEQP-VK.wsi.xcb.surface.query_protected_capabilities
 dEQP-VK.wsi.xcb.swapchain.create.image_sharing_mode
 dEQP-VK.wsi.xcb.swapchain.render.device_group2
diff --git a/tests/regres/testlists/vk-wsi-PASS.txt b/tests/regres/testlists/vk-wsi-PASS.txt
index 26220b9..a4bc64e 100644
--- a/tests/regres/testlists/vk-wsi-PASS.txt
+++ b/tests/regres/testlists/vk-wsi-PASS.txt
@@ -18,9 +18,11 @@
 dEQP-VK.wsi.xcb.surface.destroy_null_handle
 dEQP-VK.wsi.xcb.surface.initial_size
 dEQP-VK.wsi.xcb.surface.query_capabilities
+dEQP-VK.wsi.xcb.surface.query_capabilities2
 dEQP-VK.wsi.xcb.surface.query_devgroup_present_capabilities
 dEQP-VK.wsi.xcb.surface.query_devgroup_present_modes
 dEQP-VK.wsi.xcb.surface.query_formats
+dEQP-VK.wsi.xcb.surface.query_formats2
 dEQP-VK.wsi.xcb.surface.query_present_modes
 dEQP-VK.wsi.xcb.surface.query_support
 dEQP-VK.wsi.xcb.surface.resize