Merge vk-gl-cts/vulkan-cts-1.2.7 into vk-gl-cts/vulkan-cts-1.2.8
Change-Id: I1c3fa921a070b79cbcd31c213cfbb651c4d07530
diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
index 36f6233..c4e407c 100644
--- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
@@ -7795,7 +7795,7 @@
" float tmin = 0.001;\n"
" float tmax = 9.0;\n"
" vec3 origin = vec3(-1, -1, -1);\n"
- " vec3 target = vec3(0.5, 0.5, 0);\n"
+ " vec3 target = vec3(0.0, 0.5, 0);\n"
" vec3 direct = normalize(target - origin);\n"
"\n"
" traceRayEXT(topLevelAS, rayFlags, cullMask, 0, 0, 0, origin, tmin, direct, tmax, 0);\n"
diff --git a/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFilteringTests.cpp b/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFilteringTests.cpp
index 6073e0d..9c5a1d7 100644
--- a/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFilteringTests.cpp
+++ b/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFilteringTests.cpp
@@ -609,6 +609,10 @@
if (m_chromaFiltering != VK_FILTER_LINEAR &&
(featureFlags & VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT) == 0)
TCU_THROW(NotSupportedError, "Different chroma, min, and mag filters not supported for format");
+
+ if (m_chromaFiltering == VK_FILTER_LINEAR &&
+ (featureFlags & VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT) == 0)
+ TCU_THROW(NotSupportedError, "Linear chroma filtering not supported for format");
}
vkt::TestInstance* LinearFilteringTestCase::createInstance(vkt::Context& context) const
