Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I373a9df4f575b5f9d90b2c9f651c1a69b9265f1d
diff --git a/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp b/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
index 0cde694..c132d17 100644
--- a/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
+++ b/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
@@ -335,10 +335,13 @@
// Verify that we can read from the output variable
vss << " if (gl_PrimitiveShadingRateEXT != pc.shadingRate) readbackok = 0;\n";
- if (m_data.multiViewport)
- vss << " gl_ViewportIndex = instanceIndex & 1;\n";
- if (m_data.colorLayered)
- vss << " gl_Layer = (instanceIndex & 2) >> 1;\n";
+ if (!m_data.geometryShader)
+ {
+ if (m_data.multiViewport)
+ vss << " gl_ViewportIndex = instanceIndex & 1;\n";
+ if (m_data.colorLayered)
+ vss << " gl_Layer = (instanceIndex & 2) >> 1;\n";
+ }
}
vss << "}\n";
diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildIndirectTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildIndirectTests.cpp
index f0ed091..be22c86 100644
--- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildIndirectTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildIndirectTests.cpp
@@ -632,7 +632,7 @@
{
VkBuffer result = DE_NULL;
- m_indirectAccelerationStructureBottom = prepareBuffer(sizeof(VkAccelerationStructureBuildRangeInfoKHR), "wr-asb");
+ m_indirectAccelerationStructureBottom = prepareBuffer(sizeof(VkAccelerationStructureBuildRangeInfoKHR) * m_data.geometriesGroupCount, "wr-asb");
result = **m_indirectAccelerationStructureBottom;
return result;
diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayControlTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayControlTests.cpp
index 647695b..9b0a0be 100644
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayControlTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayControlTests.cpp
@@ -1024,7 +1024,7 @@
VkResult result = vkd.displayPowerControlEXT(device, display, &displayPowerInfo);
if (result != VK_SUCCESS)
- tcu::TestStatus::fail(std::string("vkDisplayPowerControlEXT returned invalid result for ") + de::toString(psd.state));
+ return tcu::TestStatus::fail(std::string("vkDisplayPowerControlEXT returned invalid result for ") + de::toString(psd.state));
deSleep(psd.waitMs);
}
@@ -1060,7 +1060,7 @@
VkDisplayKHR& display = availableDisplays[i];
VkResult result = vkd.registerDisplayEventEXT(device, display, &displayEventInfo, DE_NULL, &fence);
if (result != VK_SUCCESS)
- tcu::TestStatus::fail(std::string("vkRegisterDisplayEventEXT returned invalid result"));
+ return tcu::TestStatus::fail(std::string("vkRegisterDisplayEventEXT returned invalid result"));
}
// deinit fence
@@ -1087,7 +1087,7 @@
VkResult result = vkd.registerDeviceEventEXT(device, &deviceEventInfo, DE_NULL, &fences[0]);
if (result != VK_SUCCESS)
- tcu::TestStatus::fail(std::string("vkRegisterDeviceEventEXT returned invalid result"));
+ return tcu::TestStatus::fail(std::string("vkRegisterDeviceEventEXT returned invalid result"));
// deinit fence
deinitFences(vkd, device, fences);
