re-enable ObjectToWorld3x4EXT and WorldToObject3x4EXT built-in tests

VK-GL-CTS Issue #2451

Update to glslang version which is fixed and re-enable tests

Component: Vulkan
Affects:
dEQP-VK.ray_tracing_pipeline.builtin.*3x4ext.*

Change-Id: I59c57dd06513a30c0ad782b462c1f0c59fa95d50

diff --git a/android/cts/master/vk-master-2020-03-01.txt b/android/cts/master/vk-master-2020-03-01.txt
index e95c1b6..d0cf802 100644 (file)
--- a/android/cts/master/vk-master-2020-03-01.txt
+++ b/android/cts/master/vk-master-2020-03-01.txt
@@ -290268,6 +290268,16 @@ dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.chit_triangles
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.ahit_aabs
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.chit_aabs
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.sect_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.ahit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.chit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.ahit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.chit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.sect_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.ahit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.chit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.ahit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.chit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.sect_aabs
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.64
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.256
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.1024

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 8b6065d..d026da4 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -700461,6 +700461,16 @@ dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.chit_triangles
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.ahit_aabs
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.chit_aabs
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.sect_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.ahit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.chit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.ahit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.chit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.sect_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.ahit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.chit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.ahit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.chit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.sect_aabs
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.64
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.256
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.1024

diff --git a/external/fetch_sources.py b/external/fetch_sources.py
index 5e0c65c..7bf270c 100644 (file)
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -321,7 +321,7 @@ PACKAGES = [
        GitRepo(
                "https://gitlab.khronos.org/GLSL/glslang.git",
                "git@gitlab.khronos.org:GLSL/glslang.git",
-               "13565cf458eb2c2b32b3fe9af343f0a30566b96b",
+               "4a6360af4f2b5799d97b69f8497cc8c1117262e5",
                "glslang",
                removeTags = ["master-tot"]),
        GitRepo(

diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp
index 22b40f1..c7ace35 100644 (file)
--- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuiltinTests.cpp
@@ -2818,11 +2818,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        },
-#if 0
-        // disable 3x4 tests due to glslang bug https://github.com/KhronosGroup/glslang/issues/2329
         { TEST_ID_OBJECT_TO_WORLD_3X4_EXT,             "ObjectToWorld3x4EXT"   ,                       A       |       C       |       I                                       , createMultiOutputTests        },
         { TEST_ID_WORLD_TO_OBJECT_3X4_EXT,             "WorldToObject3x4EXT"   ,                       A       |       C       |       I                                       , createMultiOutputTests        },
-#endif
        };
 
        de::MovePtr<tcu::TestCaseGroup> builtinGroup(new tcu::TestCaseGroup(testCtx, "builtin", "Ray tracing shader builtin tests"));

diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt
index 4a40ffd..cac9c07 100644 (file)
--- a/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@ -702671,6 +702671,16 @@ dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.chit_triangles
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.ahit_aabs
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.chit_aabs
 dEQP-VK.ray_tracing_pipeline.builtin.worldtoobjectext.sect_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.ahit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.chit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.ahit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.chit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.objecttoworld3x4ext.sect_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.ahit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.chit_triangles
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.ahit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.chit_aabs
+dEQP-VK.ray_tracing_pipeline.builtin.worldtoobject3x4ext.sect_aabs
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.64
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.256
 dEQP-VK.ray_tracing_pipeline.large_shader_set.gpu.1024