dEQP-VK: Stop requiring the destination format to support linear sampling for blit...

Affected tests: dEQP-VK.api.copy_and_blit.core.blit_image.*linear

Components: Vulkan
VK-GL-CTS issue: 1347

Change-Id: I6d802ad3a9cdd03404875fb5c55855a104bdf1c3

diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
index 0809eb7..dc9b02f 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
@@ -2606,13 +2606,8 @@ public:
                        TCU_THROW(NotSupportedError, "Format feature blit destination not supported");
                }
 
-               if (m_params.filter == VK_FILTER_LINEAR)
-               {
-                       if (!(srcFormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT))
-                               TCU_THROW(NotSupportedError, "Source format feature sampled image filter linear not supported");
-                       if (!(dstFormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT))
-                               TCU_THROW(NotSupportedError, "Destination format feature sampled image filter linear not supported");
-               }
+               if (m_params.filter == VK_FILTER_LINEAR && !(srcFormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT))
+                       TCU_THROW(NotSupportedError, "Source format feature sampled image filter linear not supported");
        }
 
 private:
@@ -3286,13 +3281,8 @@ public:
                        TCU_THROW(NotSupportedError, "Format feature blit destination not supported");
                }
 
-               if (m_params.filter == VK_FILTER_LINEAR)
-               {
-                       if (!(srcFormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT))
-                               TCU_THROW(NotSupportedError, "Source format feature sampled image filter linear not supported");
-                       if (!(dstFormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT))
-                               TCU_THROW(NotSupportedError, "Destination format feature sampled image filter linear not supported");
-               }
+               if (m_params.filter == VK_FILTER_LINEAR && !(srcFormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT))
+                       TCU_THROW(NotSupportedError, "Source format feature sampled image filter linear not supported");
        }
 
 private: