Enable sliced 3D ASTC cases in pipeline.{image,image_view,sampler}

Support for sliced 3D ASTC textures is optional.

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageTests.cpp
index af592c5..6fd422b 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageTests.cpp
@@ -568,10 +568,6 @@ tcu::TestCaseGroup* createImageTests (tcu::TestContext& testCtx)
                                // Do not use compressed formats with 1D and 1D array textures.
                                if (viewType == VK_IMAGE_VIEW_TYPE_1D || viewType == VK_IMAGE_VIEW_TYPE_1D_ARRAY)
                                        break;
-
-                               // 3D ASTC textures are not supported.
-                               if (tcu::isAstcFormat(mapVkCompressedFormat(format)) && viewType == VK_IMAGE_VIEW_TYPE_3D)
-                                       break;
                        }
 
                        de::MovePtr<tcu::TestCaseGroup> formatGroup     (new tcu::TestCaseGroup(testCtx,

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp
index da35e78..600adba 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp
@@ -778,10 +778,6 @@ tcu::TestCaseGroup* createImageViewTests (tcu::TestContext& testCtx)
                                // Do not use compressed formats with 1D and 1D array textures.
                                if (viewType == VK_IMAGE_VIEW_TYPE_1D || viewType == VK_IMAGE_VIEW_TYPE_1D_ARRAY)
                                        break;
-
-                               // 3D ASTC textures are not supported.
-                               if (tcu::isAstcFormat(mapVkCompressedFormat(format)) && viewType == VK_IMAGE_VIEW_TYPE_3D)
-                                       break;
                        }
 
                        de::MovePtr<tcu::TestCaseGroup> formatGroup     (new tcu::TestCaseGroup(testCtx,

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp
index 9a0aa14..de60cef 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp
@@ -882,10 +882,6 @@ tcu::TestCaseGroup* createSamplerTests (tcu::TestContext& testCtx)
                                // Do not use compressed formats with 1D and 1D array textures.
                                if (viewType == VK_IMAGE_VIEW_TYPE_1D || viewType == VK_IMAGE_VIEW_TYPE_1D_ARRAY)
                                        break;
-
-                               // 3D ASTC textures are not supported.
-                               if (tcu::isAstcFormat(mapVkCompressedFormat(format)) && viewType == VK_IMAGE_VIEW_TYPE_3D)
-                                       break;
                        }
 
                        de::MovePtr<tcu::TestCaseGroup> formatGroup     (new tcu::TestCaseGroup(testCtx,