Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2
Change-Id: If13d31edfaa41aab48bbca57024722276b86a511
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 72ef375..5710d41 100755
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -302781,9 +302781,11 @@
dEQP-VK.tessellation.primitive_discard.triangles_equal_spacing_ccw_point_mode
dEQP-VK.tessellation.primitive_discard.triangles_equal_spacing_cw
dEQP-VK.tessellation.primitive_discard.triangles_equal_spacing_cw_point_mode
+dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_valid_levels
dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw
dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_point_mode_valid_levels
dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_point_mode
+dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_valid_levels
dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw
dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_point_mode_valid_levels
dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_point_mode
@@ -302795,9 +302797,11 @@
dEQP-VK.tessellation.primitive_discard.quads_equal_spacing_ccw_point_mode
dEQP-VK.tessellation.primitive_discard.quads_equal_spacing_cw
dEQP-VK.tessellation.primitive_discard.quads_equal_spacing_cw_point_mode
+dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_valid_levels
dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw
dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_point_mode_valid_levels
dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_point_mode
+dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_valid_levels
dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw
dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_point_mode_valid_levels
dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_point_mode
diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
index 673480e..6d1a7f3 100644
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
@@ -525,7 +525,7 @@
{
m_heaps[heapNdx].heap = m_memoryProperties.memoryHeaps[heapNdx];
m_heaps[heapNdx].memoryUsage = 0;
- m_heaps[heapNdx].maxMemoryUsage = m_heaps[heapNdx].heap.size / 2; /* Use at maximum 50% of heap */
+ m_heaps[heapNdx].maxMemoryUsage = m_heaps[heapNdx].heap.size / 8; /* Use at maximum 12.5% of heap */
m_heaps[heapNdx].objects.reserve(100);
}
diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp
index 1f65f11..5b02e39 100644
--- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp
+++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp
@@ -64,12 +64,11 @@
bool lessThanOneInnerLevelsDefined (const CaseDefinition& caseDef)
{
// From Vulkan API specification:
- // >> When tessellating triangles or quads in point mode with fractional odd spacing, the tessellator
+ // >> When tessellating triangles or quads (with/without point mode) with fractional odd spacing, the tessellator
// >> ***may*** produce interior vertices that are positioned on the edge of the patch if an inner
// >> tessellation level is less than or equal to one.
return !((caseDef.primitiveType == vkt::tessellation::TESSPRIMITIVETYPE_QUADS ||
caseDef.primitiveType == vkt::tessellation::TESSPRIMITIVETYPE_TRIANGLES) &&
- caseDef.usePointMode &&
caseDef.spacingMode == vkt::tessellation::SPACINGMODE_FRACTIONAL_ODD);
}
diff --git a/external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt b/external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt
index f9b9568..4f63866 100644
--- a/external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt
+++ b/external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt
@@ -50,3 +50,10 @@
#VK-GL-CTS 749
dEQP-VK.glsl.builtin.precision.atan2.mediump_compute.*
+
+#VK-GL-CTS 1273
+dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_valid_levels
+dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_valid_levels
+dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_valid_levels
+dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_valid_levels
+
