From eeebe23284db891ba031d36ba7b2cd7499d0e629 Mon Sep 17 00:00:00 2001 From: Maciej Jesionowski Date: Wed, 21 Dec 2016 12:20:28 +0100 Subject: [PATCH] Correct a typo in blit image test case names Modified test names: - dEQP-VK.api.copy_and_blit.blit_image.simple_tests.* Change-Id: I20b09407101eb3e395d10f324e9f402f5c1c4b77 --- android/cts/master/vk-master.txt | 42 +++++++++++----------- .../vulkan/api/vktApiCopiesAndBlittingTests.cpp | 42 +++++++++++----------- external/vulkancts/mustpass/1.0.1/src/master.txt | 32 ++++++++--------- external/vulkancts/mustpass/1.0.1/vk-default.txt | 32 ++++++++--------- .../mustpass/1.0.2/src/excluded-tests.txt | 2 +- external/vulkancts/mustpass/1.0.2/vk-default.txt | 40 ++++++++++----------- 6 files changed, 95 insertions(+), 95 deletions(-) diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index f677a37..5d9df35 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -6114,13 +6114,13 @@ dEQP-VK.api.copy_and_blit.buffer_to_buffer.whole dEQP-VK.api.copy_and_blit.buffer_to_buffer.partial dEQP-VK.api.copy_and_blit.buffer_to_buffer.regions dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholer32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholeb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholer32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholeb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xyr32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_r32_sfloat_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_r32_sfloat_linear @@ -6144,29 +6144,29 @@ dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_subregions_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_subregions_r32_sfloat_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_subregions_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1r32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1b8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1r32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1b8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2r32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2b8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2r32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2b8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offsetr32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offsetb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offsetr32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offsetb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialr32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialr32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r8_uint_r8_uint_nearest dEQP-VK.api.copy_and_blit.blit_image.all_formats.r8_uint_r8g8_uint_nearest dEQP-VK.api.copy_and_blit.blit_image.all_formats.r8_uint_r8g8b8_uint_nearest diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp index 7eba7c1..860f5fb 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp @@ -4116,11 +4116,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); } // Filter is VK_FILTER_LINEAR. @@ -4132,11 +4132,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); } } @@ -4181,7 +4181,7 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)"); @@ -4508,11 +4508,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); } // Filter is VK_FILTER_LINEAR. @@ -4524,11 +4524,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); } } @@ -4573,11 +4573,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); } // Filter is VK_FILTER_LINEAR. @@ -4589,11 +4589,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); } } @@ -4638,11 +4638,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); } // Filter is VK_FILTER_LINEAR. @@ -4654,11 +4654,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); } } @@ -4705,11 +4705,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_nearest", descriptionOfRGBAToBGRA, params)); } // Filter is VK_FILTER_LINEAR. @@ -4721,11 +4721,11 @@ tcu::TestCaseGroup* createCopiesAndBlittingTests (tcu::TestContext& testCtx) params.dst.image.format = VK_FORMAT_R32_SFLOAT; const std::string descriptionOfRGBAToR32 (description + " and different formats (R8G8B8A8 -> R32)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToR32, params)); params.dst.image.format = VK_FORMAT_B8G8R8A8_UNORM; const std::string descriptionOfRGBAToBGRA (description + " and different formats (R8G8B8A8 -> B8G8R8A8)" + " (VK_FILTER_LINEAR)"); - blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); + blitImgSimpleTests->addChild(new BlittingTestCase(testCtx, testName + "_" + getFormatCaseName(params.dst.image.format) + "_linear", descriptionOfRGBAToBGRA, params)); } } diff --git a/external/vulkancts/mustpass/1.0.1/src/master.txt b/external/vulkancts/mustpass/1.0.1/src/master.txt index 986245b..2f35ecb 100644 --- a/external/vulkancts/mustpass/1.0.1/src/master.txt +++ b/external/vulkancts/mustpass/1.0.1/src/master.txt @@ -6095,29 +6095,29 @@ dEQP-VK.api.copy_and_blit.buffer_to_buffer.whole dEQP-VK.api.copy_and_blit.buffer_to_buffer.partial dEQP-VK.api.copy_and_blit.buffer_to_buffer.regions dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholer32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholeb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholer32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholeb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1r32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1b8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1r32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1b8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2r32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2b8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2r32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2b8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialr32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialr32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_r4g4_unorm_pack8_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_r4g4b4a4_unorm_pack16_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_b4g4r4a4_unorm_pack16_linear diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt index 986245b..2f35ecb 100644 --- a/external/vulkancts/mustpass/1.0.1/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt @@ -6095,29 +6095,29 @@ dEQP-VK.api.copy_and_blit.buffer_to_buffer.whole dEQP-VK.api.copy_and_blit.buffer_to_buffer.partial dEQP-VK.api.copy_and_blit.buffer_to_buffer.regions dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholer32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholeb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholer32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholeb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1r32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1b8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1r32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1b8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2r32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2b8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2r32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2b8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialr32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialr32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_r4g4_unorm_pack8_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_r4g4b4a4_unorm_pack16_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_b4g4r4a4_unorm_pack16_linear diff --git a/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt b/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt index 3351d03..ea8d52f 100644 --- a/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt +++ b/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt @@ -283,7 +283,7 @@ dEQP-VK.clipping.clip_volume.clipped.wide_lines_diagonal dEQP-VK.api.copy_and_blit.blit_image.all_formats*_nearest # Issue 431: Excluded copies and blitting tests -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offsetb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_b8g8r8a8_unorm_linear # CTS issue 426, spec issue 403 dEQP-VK.spirv_assembly.instruction.compute.opfunord.* diff --git a/external/vulkancts/mustpass/1.0.2/vk-default.txt b/external/vulkancts/mustpass/1.0.2/vk-default.txt index e4dd84e..58b7a57 100644 --- a/external/vulkancts/mustpass/1.0.2/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.2/vk-default.txt @@ -6114,13 +6114,13 @@ dEQP-VK.api.copy_and_blit.buffer_to_buffer.whole dEQP-VK.api.copy_and_blit.buffer_to_buffer.partial dEQP-VK.api.copy_and_blit.buffer_to_buffer.regions dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholer32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholeb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholer32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.wholeb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.whole_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xyr32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_r32_sfloat_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_xy_r32_sfloat_linear @@ -6144,28 +6144,28 @@ dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_subregions_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_subregions_r32_sfloat_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.mirror_subregions_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1r32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1b8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1r32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1b8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole1_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2r32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2b8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2r32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2b8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_whole2_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offsetr32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offsetb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offsetr32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.scaling_and_offset_r32_sfloat_linear dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialr32_sfloat_nearest -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialb8g8r8a8_unorm_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_r32_sfloat_nearest +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_b8g8r8a8_unorm_nearest dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialr32_sfloat_linear -dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partialb8g8r8a8_unorm_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_r32_sfloat_linear +dEQP-VK.api.copy_and_blit.blit_image.simple_tests.without_scaling_partial_b8g8r8a8_unorm_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_r4g4_unorm_pack8_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_r4g4b4a4_unorm_pack16_linear dEQP-VK.api.copy_and_blit.blit_image.all_formats.r4g4_unorm_pack8_b4g4r4a4_unorm_pack16_linear -- 2.7.4