From ef0171288368ab3f58d9568b940818119729bb25 Mon Sep 17 00:00:00 2001
From: Dominik Witczak <dominik.witczak@amd.com>
Date: Wed, 19 Aug 2020 10:40:12 +0200
Subject: [PATCH] Make sure only relevant SBT record stride bits are used, as
 per GLSL ext spec.

New tests:
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.*extraSBTRecordStrideBits

Components: Vulkan
VK-GL-CTS issue: 2477

Change-Id: I657fb17a61439c954ac91e2ed753867149c495df
---
 android/cts/master/vk-master-2020-03-01.txt        | 24 ++++++++++++++++++++
 android/cts/master/vk-master.txt                   | 24 ++++++++++++++++++++
 .../vktRayTracingShaderBindingTableTests.cpp       | 26 +++++++++++++++++-----
 external/vulkancts/mustpass/master/vk-default.txt  | 24 ++++++++++++++++++++
 4 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/android/cts/master/vk-master-2020-03-01.txt b/android/cts/master/vk-master-2020-03-01.txt
index 7020d7c..fe22ae2 100644
--- a/android/cts/master/vk-master-2020-03-01.txt
+++ b/android/cts/master/vk-master-2020-03-01.txt
@@ -299873,121 +299873,145 @@ dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_s
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.2_0
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index a722ad4..e3f56b0 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -710066,121 +710066,145 @@ dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_s
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.2_0
diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingShaderBindingTableTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingShaderBindingTableTests.cpp
index f8bd086..c63828b 100644
--- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingShaderBindingTableTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingShaderBindingTableTests.cpp
@@ -122,6 +122,7 @@ struct TestParams
 	bool								shaderRecordPresent;
 	deUint32							sbtRecordOffset;
 	deUint32							sbtRecordStride;
+	deUint32							sbtRecordStridePassedToTraceRay;
 	de::SharedPtr<TestConfiguration>	testConfiguration;
 
 };
@@ -288,7 +289,7 @@ de::MovePtr<BufferWithMemory> CheckerboardConfiguration::initUniformBuffer (Cont
 	{
 		case STT_HIT:
 		{
-			uniformValue = tcu::UVec4(testParams.sbtRecordOffset, testParams.sbtRecordStride, 0, 0);
+			uniformValue = tcu::UVec4(testParams.sbtRecordOffset, testParams.sbtRecordStridePassedToTraceRay, 0, 0);
 			break;
 		}
 		case STT_MISS:
@@ -298,7 +299,7 @@ de::MovePtr<BufferWithMemory> CheckerboardConfiguration::initUniformBuffer (Cont
 		}
 		case STT_CALL:
 		{
-			uniformValue = tcu::UVec4(testParams.sbtRecordOffset, testParams.sbtRecordStride, 0, 0);
+			uniformValue = tcu::UVec4(testParams.sbtRecordOffset, testParams.sbtRecordStridePassedToTraceRay, 0, 0);
 			break;
 		}
 		default:
@@ -1034,9 +1035,15 @@ tcu::TestCaseGroup*	createShaderBindingTableTests (tcu::TestContext& testCtx)
 				deUint32 maxSbtRecordStride	= (shaderTestTypes[shaderTestNdx].shaderTestType == STT_HIT) ? MAX_HIT_SBT_RECORD_STRIDE + 1 : 1;
 				deUint32 maxSbtRecordOffset	= MAX_SBT_RECORD_OFFSET;
 
-				for (deUint32 sbtRecordOffset = 0; sbtRecordOffset < maxSbtRecordOffset; ++sbtRecordOffset)
-				for (deUint32 sbtRecordStride = 0; sbtRecordStride < maxSbtRecordStride; ++sbtRecordStride)
+				for (deUint32 sbtRecordOffset = 0; sbtRecordOffset <  maxSbtRecordOffset; ++sbtRecordOffset)
+				for (deUint32 sbtRecordStride = 0; sbtRecordStride <= maxSbtRecordStride; ++sbtRecordStride)
 				{
+					if ((shaderTestTypes[shaderTestNdx].shaderTestType	!= STT_HIT)				&&
+						(sbtRecordStride								== maxSbtRecordStride))
+					{
+						continue;
+					}
+
 					TestParams testParams
 					{
 						CHECKERBOARD_WIDTH,
@@ -1044,13 +1051,22 @@ tcu::TestCaseGroup*	createShaderBindingTableTests (tcu::TestContext& testCtx)
 						shaderTestTypes[shaderTestNdx].shaderTestType,
 						shaderBufferOffsets[sbtOffsetNdx].sbtOffset,
 						shaderRecords[shaderRecordNdx].present,
-						sbtRecordOffset,
+						sbtRecordOffset & ((1u << 4) - 1),
+						//< Only first 4 least significant bits matter for SBT record stride
 						sbtRecordStride,
+						(sbtRecordStride == maxSbtRecordStride)	? maxSbtRecordStride | (~((1u << 4) - 1))
+																: sbtRecordStride,
 						de::SharedPtr<TestConfiguration>(new CheckerboardConfiguration())
 					};
 
 					std::stringstream str;
 					str << sbtRecordOffset << "_" << sbtRecordStride;
+
+					if (testParams.sbtRecordStride != testParams.sbtRecordStridePassedToTraceRay)
+					{
+						str << "_extraSBTRecordStrideBits";
+					}
+
 					shaderRecordGroup->addChild(new ShaderBindingTableIndexingTestCase(group->getTestContext(), str.str().c_str(), "", testParams));
 				}
 
diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt
index 791a53e..4293ab1 100644
--- a/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@ -712300,121 +712300,145 @@ dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_s
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_0.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_4.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_7.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.no_shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.0_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.1_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_1
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_2
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_3
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_4
+dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_hit.sbt_offset_16.shaderrecord.2_5_extraSBTRecordStrideBits
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.0_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.1_0
 dEQP-VK.ray_tracing_pipeline.shader_binding_table.indexing_miss.sbt_offset_0.no_shaderrecord.2_0
-- 
2.7.4