Only use AABBs for the shader record tests

AABBS_AND_TRIANGLES uses the instanceSBTOffset to pick between shader hit
groups, but the test only defines one shader hit group. Just using AABBs
still exercises all shaders but fits the shader groups defined by the test.

Affects: dEQP-VK.ray_tracing_pipeline.misc.shaderRecord*

Components: Vulkan
VK-GL-CTS issue: 2444

Change-Id: Ic718c22e9ef4176763179b084019a3a83ed7c584

diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
index 78797f5..d3473c3 100644 (file)
--- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
@@ -3827,11 +3827,11 @@ public:
                                                                tcu::Vec3       (1,             1,              1),             /* gridCellSizeXYZ       */
                                                                m_gridSizeXYZ,
                                                                tcu::Vec3       (2.0f,  2.0f,   2.0f),  /* gridInterCellDeltaXYZ */
-                                                               GeometryType::AABB_AND_TRIANGLES)
+                                                               GeometryType::AABB)
                );
 
                m_tlPtr  = m_asProviderPtr->createTLAS( context,
-                                                                                               AccelerationStructureLayout::ONE_TL_MANY_BLS_MANY_GEOMETRIES_WITH_VARYING_PRIM_TYPES,
+                                                                                               AccelerationStructureLayout::ONE_TL_MANY_BLS_MANY_GEOMETRIES,
                                                                                                commandBuffer,
                                                                                                VK_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT_KHR,
                                                                                                nullptr,        /* optASPropertyProviderPtr */