From: Matthew Netsch <quic_mnetsch@quicinc.com>
Date: Thu, 7 Jul 2022 20:21:58 +0000 (+0000)
Subject: Merge vk-gl-cts/vulkan-cts-1.3.2 into vk-gl-cts/vulkan-cts-1.3.3
X-Git-Tag: upstream/1.3.5~144^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa41843fb0159ee9e05ff4a608c230fb1f65e953;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge vk-gl-cts/vulkan-cts-1.3.2 into vk-gl-cts/vulkan-cts-1.3.3

Change-Id: Ic26b0069d50734146363779c7d7f0362f5d33496
---

aa41843fb0159ee9e05ff4a608c230fb1f65e953
diff --cc external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp
index 1bf6530,26272e6..3f389bb
--- a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp
+++ b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp
@@@ -2099,12 -2106,10 +2106,12 @@@ tcu::TestStatus EarlyFragmentSampleCoun
  			log << tcu::TestLog::Message << "Passed Samples (with early fragment test)    : " << de::toString(sampleCounts[1]) << tcu::TestLog::EndMessage;
  		}
  
 +#ifndef CTS_USES_VULKANSC
  		vk.destroyQueryPool(device, queryPool, nullptr);
 +#endif // CTS_USES_VULKANSC
  
  		// Check that number of the all passed samples are within an acceptable range.
- 		if (sampleCounts[0] >= minValue && sampleCounts[0] <= maxValue && sampleCounts[1] >= minValue && sampleCounts[1] <= maxValue)
+ 		if (sampleCounts[QUERY_INDEX_NO_EARLY_FRAG] >= minValue && sampleCounts[QUERY_INDEX_NO_EARLY_FRAG] <= maxValue && sampleCounts[QUERY_INDEX_EARLY_FRAG] >= minValue && sampleCounts[QUERY_INDEX_EARLY_FRAG] <= maxValue)
  		{
  			return tcu::TestStatus::pass("Success");
  		}