Merge vk-gl-cts/vulkan-cts-1.3.3 into vk-gl-cts/main
Change-Id: I657e2758e52b9eba16b296ea0bcde5b58196c6e8
diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 1aa5e1c..e19322c 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -2176,10 +2176,21 @@
struct CheckEnumeratePhysicalDeviceGroupsIncompleteResult : public CheckIncompleteResult<VkPhysicalDeviceGroupProperties>
{
- void getResult (Context& context, VkPhysicalDeviceGroupProperties* data)
+ CheckEnumeratePhysicalDeviceGroupsIncompleteResult (const InstanceInterface& vki, const VkInstance instance)
+ : m_vki (vki)
+ , m_instance (instance)
+ {}
+
+ void getResult (Context&, VkPhysicalDeviceGroupProperties* data)
{
- m_result = context.getInstanceInterface().enumeratePhysicalDeviceGroups(context.getInstance(), &m_count, data);
+ for (uint32_t idx = 0u; idx < m_count; ++idx)
+ data[idx] = initVulkanStructure();
+ m_result = m_vki.enumeratePhysicalDeviceGroups(m_instance, &m_count, data);
}
+
+protected:
+ const InstanceInterface& m_vki;
+ const VkInstance m_instance;
};
struct CheckEnumerateInstanceLayerPropertiesIncompleteResult : public CheckIncompleteResult<VkLayerProperties>
@@ -2246,7 +2257,7 @@
{
TestLog& log = context.getTestContext().getLog();
tcu::ResultCollector results (log);
- const CustomInstance instance (createCustomInstanceWithExtension(context, "VK_KHR_device_group_creation"));
+ CustomInstance instance (createCustomInstanceWithExtension(context, "VK_KHR_device_group_creation"));
const InstanceDriver& vki (instance.getDriver());
const vector<VkPhysicalDeviceGroupProperties> devicegroups = enumeratePhysicalDeviceGroups(vki, instance);
@@ -2255,8 +2266,9 @@
for (size_t ndx = 0; ndx < devicegroups.size(); ndx++)
log << TestLog::Message << ndx << ": " << devicegroups[ndx] << TestLog::EndMessage;
- CheckEnumeratePhysicalDeviceGroupsIncompleteResult()(context, results, devicegroups.size());
+ CheckEnumeratePhysicalDeviceGroupsIncompleteResult(vki, instance)(context, results, devicegroups.size());
+ instance.collectMessages();
return tcu::TestStatus(results.getResult(), results.getMessage());
}
diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp
index 7cfb66f..138749a 100755
--- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp
+++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp
@@ -598,7 +598,7 @@
));
}
- deviceInterface.cmdPipelineBarrier(*commandBuffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0u, 0u, DE_NULL, 0u, DE_NULL, static_cast<deUint32>(imageSparseShaderStorageBarriers.size()), imageSparseShaderStorageBarriers.data());
+ deviceInterface.cmdPipelineBarrier(*commandBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0u, 0u, DE_NULL, 0u, DE_NULL, static_cast<deUint32>(imageSparseShaderStorageBarriers.size()), imageSparseShaderStorageBarriers.data());
}
// Create descriptor set layout
diff --git a/external/vulkancts/mustpass/main/src/test-issues.txt b/external/vulkancts/mustpass/main/src/test-issues.txt
index 79e3770..5606c04 100644
--- a/external/vulkancts/mustpass/main/src/test-issues.txt
+++ b/external/vulkancts/mustpass/main/src/test-issues.txt
@@ -9,4 +9,8 @@
dEQP-VK.ray_tracing_pipeline.acceleration_structures.query_pool_results.cpu.memory.size
dEQP-VK.ray_tracing_pipeline.acceleration_structures.query_pool_results.cpu.buffer.size
dEQP-VK.ray_tracing_pipeline.acceleration_structures.query_pool_results.gpu.memory.size
-dEQP-VK.ray_tracing_pipeline.acceleration_structures.query_pool_results.gpu.buffer.size
\ No newline at end of file
+dEQP-VK.ray_tracing_pipeline.acceleration_structures.query_pool_results.gpu.buffer.size
+
+# Issue 3759: dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.* creates an invalid pColorBlendState
+dEQP-VK.pipeline.*.color_write_enable_maxa.cwe_after_bind.*
+dEQP-VK.pipeline.*.color_write_enable_maxa.cwe_before_bind.*
diff --git a/external/vulkancts/mustpass/main/vk-default/pipeline/fast-linked-library.txt b/external/vulkancts/mustpass/main/vk-default/pipeline/fast-linked-library.txt
index e39b0a1..526a2ed 100644
--- a/external/vulkancts/mustpass/main/vk-default/pipeline/fast-linked-library.txt
+++ b/external/vulkancts/mustpass/main/vk-default/pipeline/fast-linked-library.txt
@@ -225383,27 +225383,3 @@
dEQP-VK.pipeline.fast_linked_library.shader_module_identifier.pipeline_from_id.graphics.4_variants.use_spec_constants.use_pipeline_cache.pseudorandom_id.no_exec_properties.vert_geom_frag
dEQP-VK.pipeline.fast_linked_library.shader_module_identifier.pipeline_from_id.graphics.4_variants.use_spec_constants.use_pipeline_cache.pseudorandom_id.no_exec_properties.vert_tesc_tese_geom_frag
dEQP-VK.pipeline.fast_linked_library.shader_module_identifier.hlsl_tessellation.test
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments3_more0
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments3_more1
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments3_more2
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments3_more3
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments4_more0
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments4_more1
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments4_more2
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments4_more3
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments5_more0
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments5_more1
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments5_more2
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_before_bind.attachments5_more3
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments3_more0
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments3_more1
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments3_more2
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments3_more3
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments4_more0
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments4_more1
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments4_more2
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments4_more3
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments5_more0
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments5_more1
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments5_more2
-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind.attachments5_more3
diff --git a/external/vulkancts/mustpass/main/vk-default/pipeline/monolithic.txt b/external/vulkancts/mustpass/main/vk-default/pipeline/monolithic.txt
index fc188df..543744a 100644
--- a/external/vulkancts/mustpass/main/vk-default/pipeline/monolithic.txt
+++ b/external/vulkancts/mustpass/main/vk-default/pipeline/monolithic.txt
@@ -227343,30 +227343,6 @@
dEQP-VK.pipeline.monolithic.shader_module_identifier.pipeline_from_id.ray_tracing_libs.4_variants.use_spec_constants.use_pipeline_cache.pseudorandom_id.no_exec_properties.rgen_isec_ahit_chit_miss
dEQP-VK.pipeline.monolithic.shader_module_identifier.pipeline_from_id.ray_tracing_libs.4_variants.use_spec_constants.use_pipeline_cache.pseudorandom_id.no_exec_properties.rgen_call
dEQP-VK.pipeline.monolithic.shader_module_identifier.hlsl_tessellation.test
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments3_more0
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments3_more1
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments3_more2
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments3_more3
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments4_more0
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments4_more1
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments4_more2
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments4_more3
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments5_more0
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments5_more1
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments5_more2
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_before_bind.attachments5_more3
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments3_more0
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments3_more1
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments3_more2
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments3_more3
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments4_more0
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments4_more1
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments4_more2
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments4_more3
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments5_more0
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments5_more1
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments5_more2
-dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments5_more3
dEQP-VK.pipeline.monolithic.misc.position_to_ssbo
dEQP-VK.pipeline.monolithic.misc.primitive_id_from_tess
dEQP-VK.pipeline.monolithic.derivative.compute.derivative_by_handle
diff --git a/external/vulkancts/mustpass/main/vk-default/pipeline/pipeline-library.txt b/external/vulkancts/mustpass/main/vk-default/pipeline/pipeline-library.txt
index 489c841..7f2d738 100644
--- a/external/vulkancts/mustpass/main/vk-default/pipeline/pipeline-library.txt
+++ b/external/vulkancts/mustpass/main/vk-default/pipeline/pipeline-library.txt
@@ -225383,30 +225383,6 @@
dEQP-VK.pipeline.pipeline_library.shader_module_identifier.pipeline_from_id.graphics.4_variants.use_spec_constants.use_pipeline_cache.pseudorandom_id.no_exec_properties.vert_geom_frag
dEQP-VK.pipeline.pipeline_library.shader_module_identifier.pipeline_from_id.graphics.4_variants.use_spec_constants.use_pipeline_cache.pseudorandom_id.no_exec_properties.vert_tesc_tese_geom_frag
dEQP-VK.pipeline.pipeline_library.shader_module_identifier.hlsl_tessellation.test
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments3_more0
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments3_more1
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments3_more2
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments3_more3
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments4_more0
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments4_more1
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments4_more2
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments4_more3
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments5_more0
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments5_more1
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments5_more2
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_before_bind.attachments5_more3
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments3_more0
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments3_more1
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments3_more2
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments3_more3
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments4_more0
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments4_more1
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments4_more2
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments4_more3
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments5_more0
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments5_more1
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments5_more2
-dEQP-VK.pipeline.pipeline_library.color_write_enable_maxa.cwe_after_bind.attachments5_more3
dEQP-VK.pipeline.pipeline_library.graphics_library.fast.4
dEQP-VK.pipeline.pipeline_library.graphics_library.fast.0_1111
dEQP-VK.pipeline.pipeline_library.graphics_library.fast.0_112
