projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 34dd6db)
Remove some RT SkipTriangles tests
authorPiotr Byszewski <piotr.byszewski@mobica.com>
Tue, 12 Jul 2022 14:51:53 +0000 (16:51 +0200)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Fri, 15 Jul 2022 17:48:51 +0000 (17:48 +0000)
Some conformance tests set SkipTriangles flag together with
either CullBackFacingTri or CullFrontFacingTri. This is now
illegal and those tests were removed.

Components: Vulkan

VK-GL-CTS issue: 3647

Affects:
dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.*

Change-Id: I0122fec91deca58ddd093dfa6ea03f51983f77c9

android/cts/main/src/vk-master-2021-03-01.txt patch | blob | history
android/cts/main/vk-master-2021-03-01/ray-tracing-pipeline.txt patch | blob | history
android/cts/main/vk-master/ray-tracing-pipeline.txt patch | blob | history
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp patch | blob | history
external/vulkancts/mustpass/main/vk-default/ray-tracing-pipeline.txt patch | blob | history

diff --git a/android/cts/main/src/vk-master-2021-03-01.txt b/android/cts/main/src/vk-master-2021-03-01.txt
index c2bee22..92ff36b 100644 (file)
--- a/android/cts/main/src/vk-master-2021-03-01.txt
+++ b/android/cts/main/src/vk-master-2021-03-01.txt
@@ -250776,18 +250776,6 @@ dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflag
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.ahit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.chit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.miss
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.ahit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.chit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.miss
diff --git a/android/cts/main/vk-master-2021-03-01/ray-tracing-pipeline.txt b/android/cts/main/vk-master-2021-03-01/ray-tracing-pipeline.txt
index 0b6ab4e..bf32268 100644 (file)
--- a/android/cts/main/vk-master-2021-03-01/ray-tracing-pipeline.txt
+++ b/android/cts/main/vk-master-2021-03-01/ray-tracing-pipeline.txt
@@ -1297,18 +1297,6 @@ dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflag
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.ahit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.chit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.miss
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.ahit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.chit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.miss
diff --git a/android/cts/main/vk-master/ray-tracing-pipeline.txt b/android/cts/main/vk-master/ray-tracing-pipeline.txt
index 215ba83..ab763e2 100644 (file)
--- a/android/cts/main/vk-master/ray-tracing-pipeline.txt
+++ b/android/cts/main/vk-master/ray-tracing-pipeline.txt
@@ -2028,18 +2028,6 @@ dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflag
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.ahit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.chit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.miss
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.ahit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.chit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.miss
diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp
index 0834e04..409ba99 100644 (file)
--- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp
@@ -2720,6 +2720,13 @@ void createRayFlagsTests (tcu::TestContext& testCtx, tcu::TestCaseGroup* builtin
                                if (skipTriangles && skipAABBs)
                                        continue;
 
+                               // Skipping - SkipTrianglesKHR is mutually exclusive with CullBackFacingTrianglesKHR and CullFrontFacingTrianglesKHR
+                               if ((geomTypes[geomTypesNdx].geomType == GEOM_TYPE_TRIANGLES) && skipRayFlags[skipRayFlagsNdx].skipTriangles &&
+                                       (pipelineFlags[pipelineFlagsNdx].flag == static_cast<VkPipelineCreateFlags>(0)))
+                               {
+                                       continue;
+                               }
+
                                de::MovePtr<tcu::TestCaseGroup> pipelineFlagsGroup      (new tcu::TestCaseGroup(testCtx, pipelineFlags[pipelineFlagsNdx].name, ""));
 
                                for (size_t opaquesNdx = 0; opaquesNdx < DE_LENGTH_OF_ARRAY(opaques); ++opaquesNdx)
@@ -2890,8 +2897,8 @@ tcu::TestCaseGroup*       createBuiltinTests (tcu::TestContext& testCtx)
                { TEST_ID_HIT_KIND_EXT,                                 "HitKindEXT"                    ,                       A       |       C                                                       , createScalarTests                     },
                { TEST_ID_OBJECT_TO_WORLD_EXT,                  "ObjectToWorldEXT"              ,                       A       |       C       |       I                                       , createMultiOutputTests        },
                { TEST_ID_WORLD_TO_OBJECT_EXT,                  "WorldToObjectEXT"              ,                       A       |       C       |       I                                       , createMultiOutputTests        },
-        { TEST_ID_OBJECT_TO_WORLD_3X4_EXT,             "ObjectToWorld3x4EXT"   ,                       A       |       C       |       I                                       , createMultiOutputTests        },
-        { TEST_ID_WORLD_TO_OBJECT_3X4_EXT,             "WorldToObject3x4EXT"   ,                       A       |       C       |       I                                       , createMultiOutputTests        },
+               { TEST_ID_OBJECT_TO_WORLD_3X4_EXT,              "ObjectToWorld3x4EXT"   ,                       A       |       C       |       I                                       , createMultiOutputTests        },
+               { TEST_ID_WORLD_TO_OBJECT_3X4_EXT,              "WorldToObject3x4EXT"   ,                       A       |       C       |       I                                       , createMultiOutputTests        },
        };
 
        de::MovePtr<tcu::TestCaseGroup> builtinGroup(new tcu::TestCaseGroup(testCtx, "builtin", "Ray tracing shader builtin tests"));
diff --git a/external/vulkancts/mustpass/main/vk-default/ray-tracing-pipeline.txt b/external/vulkancts/mustpass/main/vk-default/ray-tracing-pipeline.txt
index 9009985..c9ac802 100644 (file)
--- a/external/vulkancts/mustpass/main/vk-default/ray-tracing-pipeline.txt
+++ b/external/vulkancts/mustpass/main/vk-default/ray-tracing-pipeline.txt
@@ -2028,18 +2028,6 @@ dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflag
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.ahit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.chit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.raynoskipflags.pipelineskipaabbs.noopaque_backface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_frontface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.opaque_backface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_frontface.miss
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.ahit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.chit
-dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelinenoskipflags.noopaque_backface.miss
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.ahit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.chit
 dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.triangles.rayskiptriangles.pipelineskiptriangles.opaque_frontface.miss
Domain: Graphics System / GL;