Fixing the VkRayTracingShaderGroupTypeKHR in ray query tests

VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_KHR is needed instead of VK_RAY_TRACING_SHADER_GROUP_TYPE_PROCEDURAL_HIT_GROUP_KHR when triangle geometry is used. VK-GL-CTS issue: 5364 Affects: dEQP-VK.ray_query.* Components: Vulkan Change-Id: Ibcd26c0eba16e62eb61684dad43c8e0adb7ae9e6
KhronosGroup · Oct 17, 2024 · 7aa3551 · 7aa3551
1 parent 13f2fe9
commit 7aa3551
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/external/vulkancts/framework/vulkan/vkRayTracingUtil.hpp b/external/vulkancts/framework/vulkan/vkRayTracingUtil.hpp
@@ -1545,7 +1545,10 @@ std::vector<T> rayQueryRayTracingTestSetup(const vk::DeviceInterface &vkd, const
     {
         hitGroup  = 1;
         missGroup = 2;
-        rt_pipeline->addShader(VK_SHADER_STAGE_INTERSECTION_BIT_KHR, shaderModules[1].get()->get(), hitGroup);
+        if (params.triangles == false)
+        {
+            rt_pipeline->addShader(VK_SHADER_STAGE_INTERSECTION_BIT_KHR, shaderModules[1].get()->get(), hitGroup);
+        }
         rt_pipeline->addShader(VK_SHADER_STAGE_ANY_HIT_BIT_KHR, shaderModules[2].get()->get(), hitGroup);
         rt_pipeline->addShader(VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR, shaderModules[3].get()->get(), hitGroup);
         rt_pipeline->addShader(VK_SHADER_STAGE_MISS_BIT_KHR, shaderModules[4].get()->get(), missGroup);

diff --git a/external/vulkancts/modules/vulkan/ray_query/vktRayQueryStressTests.cpp b/external/vulkancts/modules/vulkan/ray_query/vktRayQueryStressTests.cpp
@@ -382,11 +382,13 @@ tcu::TestStatus RayQueryStressInstance::iterate(void)
     {
         m_rayQueryParams.verts.push_back(instance1);
         m_rayQueryParams.aabbs.push_back(emptyVerts);
+        m_rayQueryParams.triangles = true;
     }
     else
     {
         m_rayQueryParams.verts.push_back(emptyVerts);
         m_rayQueryParams.aabbs.push_back(instance1);
+        m_rayQueryParams.triangles = false;
     }
 
     std::vector<ResultData> resultData;