Move texture_filtering.explicit_lod under dEQP-VK.texture

Change-Id: I25a1a6e5910814ef010942d11787b6c5969b4021

diff --git a/Android.mk b/Android.mk
index 2456f9e..b881492 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -864,10 +864,13 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationWindingTests.cpp \
-       external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp \
-       external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp \
-       external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringTests.cpp \
-       external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktSampleVerifier.cpp \
+       external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureTests.cpp \
        external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp \
        external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp \
        external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp \
@@ -942,7 +945,7 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ssbo \
        $(deqp_dir)/external/vulkancts/modules/vulkan/synchronization \
        $(deqp_dir)/external/vulkancts/modules/vulkan/tessellation \
-       $(deqp_dir)/external/vulkancts/modules/vulkan/texture_filtering \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/texture \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ubo \
        $(deqp_dir)/external/vulkancts/modules/vulkan/wsi
 

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 72aae55..2c8ffbf 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -115990,196 +115990,6 @@ dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.5_
 dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.6_2
 dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.7_1
 dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.8
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x2_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.2x3_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.3x7_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.4x8_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.31x55_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x32_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.32x64_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.57x35_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_nearest_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_nearest_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_nearest_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_nearest_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_nearest_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_nearest_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture_filtering.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.b4g4r4a4_unorm_pack16_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.b4g4r4a4_unorm_pack16_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r5g6b5_unorm_pack16_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r5g6b5_unorm_pack16_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.a1r5g5b5_unorm_pack16_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.a1r5g5b5_unorm_pack16_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8_unorm_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8_unorm_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8_snorm_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8_snorm_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8g8_unorm_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8g8_unorm_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8g8_snorm_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8g8_snorm_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8g8b8a8_unorm_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8g8b8a8_unorm_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8g8b8a8_snorm_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r8g8b8a8_snorm_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.b8g8r8a8_unorm_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.b8g8r8a8_unorm_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.a8b8g8r8_unorm_pack32_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.a8b8g8r8_unorm_pack32_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.a8b8g8r8_snorm_pack32_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.a8b8g8r8_snorm_pack32_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.a2b10g10r10_unorm_pack32_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.a2b10g10r10_unorm_pack32_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r16_sfloat_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r16_sfloat_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r16g16_sfloat_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r16g16_sfloat_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r16g16b16a16_sfloat_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r16g16b16a16_sfloat_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r32_sfloat_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r32_sfloat_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r32g32_sfloat_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r32g32_sfloat_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r32g32b32a32_sfloat_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.formats.r32g32b32a32_sfloat_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.derivatives.nearest_nearest_mipmap_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.derivatives.nearest_nearest_mipmap_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.derivatives.nearest_linear_mipmap_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.derivatives.nearest_linear_mipmap_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.derivatives.linear_nearest_mipmap_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.derivatives.linear_nearest_mipmap_linear
-dEQP-VK.texture_filtering.explicit_lod.2d.derivatives.linear_linear_mipmap_nearest
-dEQP-VK.texture_filtering.explicit_lod.2d.derivatives.linear_linear_mipmap_linear
 dEQP-VK.fragment_operations.scissor.points.inside
 dEQP-VK.fragment_operations.scissor.points.partially_inside
 dEQP-VK.fragment_operations.scissor.points.outside
@@ -119219,3 +119029,193 @@ dEQP-VK.texture.mipmap.3d.max_level.nearest_nearest
 dEQP-VK.texture.mipmap.3d.max_level.linear_nearest
 dEQP-VK.texture.mipmap.3d.max_level.nearest_linear
 dEQP-VK.texture.mipmap.3d.max_level.linear_linear
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x2_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.2x3_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.3x7_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.4x8_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.31x55_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x32_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.32x64_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.57x35_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_nearest_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_nearest_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.formats.b4g4r4a4_unorm_pack16_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.b4g4r4a4_unorm_pack16_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r5g6b5_unorm_pack16_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r5g6b5_unorm_pack16_linear
+dEQP-VK.texture.explicit_lod.2d.formats.a1r5g5b5_unorm_pack16_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.a1r5g5b5_unorm_pack16_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r8_unorm_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r8_unorm_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r8_snorm_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r8_snorm_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r8g8_unorm_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r8g8_unorm_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r8g8_snorm_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r8g8_snorm_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r8g8b8a8_unorm_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r8g8b8a8_unorm_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r8g8b8a8_snorm_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r8g8b8a8_snorm_linear
+dEQP-VK.texture.explicit_lod.2d.formats.b8g8r8a8_unorm_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.b8g8r8a8_unorm_linear
+dEQP-VK.texture.explicit_lod.2d.formats.a8b8g8r8_unorm_pack32_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.a8b8g8r8_unorm_pack32_linear
+dEQP-VK.texture.explicit_lod.2d.formats.a8b8g8r8_snorm_pack32_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.a8b8g8r8_snorm_pack32_linear
+dEQP-VK.texture.explicit_lod.2d.formats.a2b10g10r10_unorm_pack32_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.a2b10g10r10_unorm_pack32_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r16_sfloat_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r16_sfloat_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r16g16_sfloat_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r16g16_sfloat_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r16g16b16a16_sfloat_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r16g16b16a16_sfloat_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r32_sfloat_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r32_sfloat_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r32g32_sfloat_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r32g32_sfloat_linear
+dEQP-VK.texture.explicit_lod.2d.formats.r32g32b32a32_sfloat_nearest
+dEQP-VK.texture.explicit_lod.2d.formats.r32g32b32a32_sfloat_linear
+dEQP-VK.texture.explicit_lod.2d.derivatives.nearest_nearest_mipmap_nearest
+dEQP-VK.texture.explicit_lod.2d.derivatives.nearest_nearest_mipmap_linear
+dEQP-VK.texture.explicit_lod.2d.derivatives.nearest_linear_mipmap_nearest
+dEQP-VK.texture.explicit_lod.2d.derivatives.nearest_linear_mipmap_linear
+dEQP-VK.texture.explicit_lod.2d.derivatives.linear_nearest_mipmap_nearest
+dEQP-VK.texture.explicit_lod.2d.derivatives.linear_nearest_mipmap_linear
+dEQP-VK.texture.explicit_lod.2d.derivatives.linear_linear_mipmap_nearest
+dEQP-VK.texture.explicit_lod.2d.derivatives.linear_linear_mipmap_linear

diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
index 31c5132..4261e43 100644 (file)
--- a/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@ -6,7 +6,6 @@ add_subdirectory(binding_model)
 add_subdirectory(spirv_assembly)
 add_subdirectory(shaderrender)
 add_subdirectory(shaderexecutor)
-add_subdirectory(texture_filtering)
 add_subdirectory(memory)
 add_subdirectory(ubo)
 add_subdirectory(dynamic_state)
@@ -31,7 +30,6 @@ include_directories(
        spirv_assembly
        shaderrender
        shaderexecutor
-       texture_filtering
        memory
        ubo
        dynamic_state
@@ -77,7 +75,6 @@ set(DEQP_VK_COMMON_LIBS
        deqp-vk-spirv-assembly
        deqp-vk-shaderrender
        deqp-vk-shaderexecutor
-       deqp-vk-texture-filtering
        deqp-vk-memory
        deqp-vk-ubo
        deqp-vk-dynamic-state

diff --git a/external/vulkancts/modules/vulkan/texture/CMakeLists.txt b/external/vulkancts/modules/vulkan/texture/CMakeLists.txt
index 5b217e0..4416395 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/texture/CMakeLists.txt
@@ -1,10 +1,21 @@
-include_directories(..)
+# dEQP-VK.texture
+
+include_directories(
+       ..
+       ../shaderexecutor
+       )
 
 set(DEQP_VK_TEXTURE_SRCS
+       vktSampleVerifier.cpp
+       vktSampleVerifier.hpp
+       vktSampleVerifierUtil.cpp
+       vktSampleVerifierUtil.hpp
        vktTextureTests.cpp
        vktTextureTests.hpp
        vktTextureTestUtil.cpp
        vktTextureTestUtil.hpp
+       vktTextureFilteringExplicitLodTests.cpp
+       vktTextureFilteringExplicitLodTests.hpp
        vktTextureFilteringTests.cpp
        vktTextureFilteringTests.hpp
        vktTextureMipmapTests.cpp
@@ -13,6 +24,7 @@ set(DEQP_VK_TEXTURE_SRCS
 
 set(DEQP_VK_TEXTURE_LIBS
        deqp-vk-common
+       deqp-vk-shaderexecutor
        tcutil
        vkutil
        )

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp b/external/vulkancts/modules/vulkan/texture/vktSampleVerifier.cpp
similarity index 99%
rename from external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
rename to external/vulkancts/modules/vulkan/texture/vktSampleVerifier.cpp
index a2108f9..8e99e63 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
+++ b/external/vulkancts/modules/vulkan/texture/vktSampleVerifier.cpp
@@ -34,7 +34,7 @@
 
 namespace vkt
 {
-namespace texture_filtering
+namespace texture
 {
 
 using namespace vk;
@@ -942,5 +942,5 @@ bool SampleVerifier::verifySample (const SampleArguments&   args,
        return verifySampleImpl(args, result, nullStream);
 }
 
-} // texture_filtering
+} // texture
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.hpp b/external/vulkancts/modules/vulkan/texture/vktSampleVerifier.hpp
similarity index 99%
rename from external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.hpp
rename to external/vulkancts/modules/vulkan/texture/vktSampleVerifier.hpp
index 8a7805c..e68107a 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.hpp
+++ b/external/vulkancts/modules/vulkan/texture/vktSampleVerifier.hpp
@@ -37,7 +37,7 @@
 
 namespace vkt
 {
-namespace texture_filtering
+namespace texture
 {
 
 struct SampleArguments
@@ -241,7 +241,7 @@ private:
        const std::vector<tcu::ConstPixelBufferAccess>& m_pba;
 };
 
-} // texture_filtering
+} // texture
 } // vkt
 
 #endif // _VKTSAMPLEVERIFIER_HPP

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp b/external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp
similarity index 99%
rename from external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp
rename to external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp
index e189bba..dfd4c5a 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp
+++ b/external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp
@@ -33,7 +33,7 @@
 
 namespace vkt
 {
-namespace texture_filtering
+namespace texture
 {
 namespace util
 {
@@ -948,5 +948,5 @@ void convertFormat (const void*             pixelPtr,
 }
 
 } // util
-} // texture_filtering
+} // texture
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.hpp b/external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.hpp
similarity index 99%
rename from external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.hpp
rename to external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.hpp
index 35360a5..8704255 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.hpp
+++ b/external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.hpp
@@ -32,7 +32,7 @@
 
 namespace vkt
 {
-namespace texture_filtering
+namespace texture
 {
 namespace util
 {
@@ -173,7 +173,7 @@ tcu::Vector<float, Size> abs (const tcu::Vector<float, Size>& v)
 }
 
 } // util
-} // texture_filtering
+} // texture
 } // vkt
 
 #endif // _VKTSAMPLEVERIFIERUTIL_HPP

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp
similarity index 99%
rename from external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp
rename to external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp
index 3b398c6..c9c6941 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp
+++ b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp
@@ -53,7 +53,7 @@
 
 namespace vkt
 {
-namespace texture_filtering
+namespace texture
 {
 
 using namespace tcu;
@@ -1523,5 +1523,5 @@ TestCaseGroup* createExplicitLodTests (TestContext& testCtx)
        return tests.release();
 }
 
-} // texture_filtering
+} // texture
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.hpp b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.hpp
similarity index 95%
rename from external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.hpp
rename to external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.hpp
index 28fd636..33bd20b 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.hpp
+++ b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.hpp
@@ -27,12 +27,12 @@
 
 namespace vkt
 {
-namespace texture_filtering
+namespace texture
 {
 
 tcu::TestCaseGroup* createExplicitLodTests (tcu::TestContext& testCtx);
 
-} // texture_filtering
+} // texture
 } // vkt
 
 #endif // _VKTTEXTUREFILTERINGEXPLICITLODTESTS_HPP

diff --git a/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp
index dccce3d..7d1e94f 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp
+++ b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp
@@ -32,6 +32,7 @@
 #include "vkRefUtil.hpp"
 #include "vktTestCase.hpp"
 #include "vktTestCaseUtil.hpp"
+#include "vktTestGroupUtil.hpp"
 #include "vktTextureFilteringTests.hpp"
 #include "vktTextureTestUtil.hpp"
 #include <string>
@@ -859,12 +860,9 @@ bool verifierCanBeUsed(const VkFormat format, const Sampler::FilterMode minFilte
                          (tcu::TexVerifierUtil::isLinearFilter(minFilter) || tcu::TexVerifierUtil::isLinearFilter(magFilter)));
 }
 
-} // anonymous
-
-void createTextureFilteringTests (tcu::TestCaseGroup* textureTests)
+void populateTextureFilteringTests (tcu::TestCaseGroup* textureFilteringTests)
 {
-       tcu::TestContext&                               testCtx                                 = textureTests->getTestContext();
-       de::MovePtr<tcu::TestCaseGroup> textureFilteringTests   (new tcu::TestCaseGroup(testCtx, "filtering", "Texture filtering tests."));
+       tcu::TestContext&       testCtx         = textureFilteringTests->getTestContext();
 
        static const struct
        {
@@ -1409,8 +1407,13 @@ void createTextureFilteringTests (tcu::TestCaseGroup* textureTests)
 
                textureFilteringTests->addChild(group3D.release());
        }
+}
 
-       textureTests->addChild(textureFilteringTests.release());
+} // anonymous
+
+tcu::TestCaseGroup*    createTextureFilteringTests     (tcu::TestContext& testCtx)
+{
+       return createTestGroup(testCtx, "filtering", "Texture filtering tests.", populateTextureFilteringTests);
 }
 
 } // texture

diff --git a/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.hpp b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.hpp
index e0362b8..614bbf5 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.hpp
+++ b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.hpp
@@ -33,7 +33,7 @@ namespace vkt
 namespace texture
 {
 
-void createTextureFilteringTests (tcu::TestCaseGroup* textureTests);
+tcu::TestCaseGroup*    createTextureFilteringTests     (tcu::TestContext& testCtx);
 
 } // texture
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp b/external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp
index 4c210d7..bb5558e 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp
+++ b/external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp
@@ -36,6 +36,7 @@
 #include "tcuTextureUtil.hpp"
 #include "tcuVectorUtil.hpp"
 #include "vkImageUtil.hpp"
+#include "vktTestGroupUtil.hpp"
 #include "vktTextureTestUtil.hpp"
 
 using namespace vk;
@@ -1697,12 +1698,9 @@ protected:
        }
 };
 
-} // anonymous
-
-void createTextureMipmappingTests (tcu::TestCaseGroup* textureTests)
+void populateTextureMipmappingTests (tcu::TestCaseGroup* textureMipmappingTests)
 {
-       tcu::TestContext&                               testCtx                                 = textureTests->getTestContext();
-       de::MovePtr<tcu::TestCaseGroup> textureMipmappingTests  (new tcu::TestCaseGroup(testCtx, "mipmap", "Texture mipmapping tests."));
+       tcu::TestContext&       testCtx         = textureMipmappingTests->getTestContext();
 
        static const struct
        {
@@ -2146,8 +2144,13 @@ void createTextureMipmappingTests (tcu::TestCaseGroup* textureTests)
 
                textureMipmappingTests->addChild(group3D.release());
        }
+}
 
-       textureTests->addChild(textureMipmappingTests.release());
+} // anonymous
+
+tcu::TestCaseGroup* createTextureMipmappingTests (tcu::TestContext& testCtx)
+{
+       return createTestGroup(testCtx, "mipmap", "Texture mipmapping tests.", populateTextureMipmappingTests);
 }
 
 } // texture

diff --git a/external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.hpp b/external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.hpp
index fbd11b4..ff8dd71 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.hpp
+++ b/external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.hpp
@@ -34,7 +34,7 @@ namespace vkt
 namespace texture
 {
 
-void createTextureMipmappingTests (tcu::TestCaseGroup* textureTests);
+tcu::TestCaseGroup*    createTextureMipmappingTests    (tcu::TestContext& testCtx);
 
 } // texture
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/texture/vktTextureTests.cpp b/external/vulkancts/modules/vulkan/texture/vktTextureTests.cpp
index a3bc44e..897cea4 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture/vktTextureTests.cpp
+++ b/external/vulkancts/modules/vulkan/texture/vktTextureTests.cpp
@@ -20,13 +20,14 @@
  *
  *//*!
  * \file
- * \brief Functional rasterization tests.
+ * \brief Texture tests.
  *//*--------------------------------------------------------------------*/
 
+#include "vktTextureTests.hpp"
 #include "vktTestGroupUtil.hpp"
 #include "vktTextureFilteringTests.hpp"
 #include "vktTextureMipmapTests.hpp"
-#include "vktTextureTests.hpp"
+#include "vktTextureFilteringExplicitLodTests.hpp"
 
 namespace vkt
 {
@@ -35,10 +36,13 @@ namespace texture
 namespace
 {
 
-void createTextureTests (tcu::TestCaseGroup* imageTests)
+void createTextureTests (tcu::TestCaseGroup* textureTests)
 {
-       createTextureFilteringTests(imageTests);
-       createTextureMipmappingTests(imageTests);
+       tcu::TestContext&       testCtx = textureTests->getTestContext();
+
+       textureTests->addChild(createTextureFilteringTests      (testCtx));
+       textureTests->addChild(createTextureMipmappingTests     (testCtx));
+       textureTests->addChild(createExplicitLodTests           (testCtx));
 }
 
 } // anonymous

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/CMakeLists.txt b/external/vulkancts/modules/vulkan/texture_filtering/CMakeLists.txt
deleted file mode 100644 (file)
index 01861e9..0000000
--- a/external/vulkancts/modules/vulkan/texture_filtering/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-include_directories(.. ../shaderexecutor)
-
-set(DEQP_VK_TEXTURE_FILTERING_SRCS
-  vktTextureFilteringTests.cpp
-  vktTextureFilteringTests.hpp
-  vktSampleVerifier.cpp
-  vktSampleVerifier.hpp
-  vktSampleVerifierUtil.cpp
-  vktSampleVerifierUtil.hpp
-  vktTextureFilteringExplicitLodTests.cpp
-  vktTextureFilteringExplicitLodTests.hpp
-)
-
-set(DEQP_VK_TEXTURE_FILTERING_LIBS
-  deqp-vk-common
-  deqp-vk-shaderexecutor
-  tcutil
-  vkutil
-)
-
-add_library(deqp-vk-texture-filtering STATIC ${DEQP_VK_TEXTURE_FILTERING_SRCS})
-target_link_libraries(deqp-vk-texture-filtering ${DEQP_VK_TEXTURE_FITLERING_LIBS})

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringTests.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringTests.cpp
deleted file mode 100644 (file)
index 38d9add..0000000
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringTests.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-------------------------------------------------------------------------
- * Vulkan Conformance Tests
- * ------------------------
- *
- * Copyright (c) 2016 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *//*!
- * \file
- * \brief Texture filtering tests
- *//*--------------------------------------------------------------------*/
-
-#include "vktTextureFilteringTests.hpp"
-
-#include "vktTextureFilteringExplicitLodTests.hpp"
-#include "deUniquePtr.hpp"
-
-namespace vkt
-{
-namespace texture_filtering
-{
-
-tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx)
-{
-       de::MovePtr<tcu::TestCaseGroup> group(new tcu::TestCaseGroup(testCtx, "texture_filtering", "Texture filtering verification tests"));
-
-       group->addChild(createExplicitLodTests(testCtx));
-
-       return group.release();
-}
-
-} // texture_filtering
-} // vkt

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringTests.hpp b/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringTests.hpp
deleted file mode 100644 (file)
index cddc743..0000000
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringTests.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _VKTTEXTUREFILTERINGTESTS_HPP
-#define _VKTTEXTUREFILTERINGTESTS_HPP
-
-/*-------------------------------------------------------------------------
- * Vulkan Conformance Tests
- * ------------------------
- *
- * Copyright (c) 2016 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *//*!
- * \file
- * \brief Texture filtering tests
- *//*--------------------------------------------------------------------*/
-
-#include "tcuDefs.hpp"
-#include "tcuTestCase.hpp"
-
-namespace vkt
-{
-namespace texture_filtering
-{
-
-tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx);
-
-} // texture_filtering
-} // vkt
-
-#endif // _VKTTEXTUREFILTERINGTESTS_HPP

diff --git a/external/vulkancts/modules/vulkan/vktTestPackage.cpp b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
index 9f47b1e..7231823 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktTestPackage.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
@@ -59,7 +59,6 @@
 #include "vktShaderRenderTextureGatherTests.hpp"
 #include "vktShaderBuiltinTests.hpp"
 #include "vktOpaqueTypeIndexingTests.hpp"
-#include "vktTextureFilteringTests.hpp"
 #include "vktUniformBlockTests.hpp"
 #include "vktDynamicStateTests.hpp"
 #include "vktSSBOLayoutTests.hpp"
@@ -395,7 +394,6 @@ void TestPackage::init (void)
        addChild(tessellation::createTests              (m_testCtx));
        addChild(rasterization::createTests             (m_testCtx));
        addChild(clipping::createTests                  (m_testCtx));
-       addChild(texture_filtering::createTests (m_testCtx));
        addChild(FragmentOperations::createTests(m_testCtx));
        addChild(texture::createTests                   (m_testCtx));
 }

diff --git a/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt b/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt
index 035bfb6..1d927b0 100644 (file)
--- a/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt
+++ b/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt
@@ -331,7 +331,7 @@ dEQP-VK.api.copy_and_blit.blit_image.all_formats.a1r5g5b5_unorm_pack16_r32g32b32
 dEQP-VK.spirv_assembly.instruction.compute.opfunord.*
 
 # New tests from AOSP
-dEQP-VK.texture_filtering.*
+dEQP-VK.texture.explicit_lod.*
 
 # Exclude tests which are not on the Android CTS mustpass list
 dEQP-VK.texture.mipmap.2d.projected.*