Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / spirv_assembly / vktSpvAsmGraphicsShaderTestUtil.cpp

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
index b412949..7810c40 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
@@ -4605,25 +4605,9 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan
                        vector<deUint8> expectedBytes;
                        expected->getBytes(expectedBytes);
 
-                       // Same vertex shader may be executed for multiple times, the output value should be expected value + non-negative integer N
-                       if (instance.customizedStages == VK_SHADER_STAGE_VERTEX_BIT)
-                       {
-                               const size_t numExpectedEntries = expectedBytes.size() / sizeof(float);
-                               const float* expectedFloats     = reinterpret_cast<const float*>(&expectedBytes.front());
-                               const float* outputFloats       = reinterpret_cast<const float*>(outResourceMemories[outputNdx]->getHostPtr());
+                       if (deMemCmp(&expectedBytes.front(), outResourceMemories[outputNdx]->getHostPtr(), expectedBytes.size()))
+                               return tcu::TestStatus::fail("Resource returned doesn't match bitwisely with expected");
 
-                               for (size_t expectedNdx = 0; expectedNdx < numExpectedEntries; ++expectedNdx)
-                               {
-                                       float diff = outputFloats[expectedNdx] - expectedFloats[expectedNdx];
-                                       if ((diff < 0) || (deFloatFloor(diff) != diff))
-                                               return tcu::TestStatus::fail("Value returned should be equal to expected value plus non-negative integer");
-                               }
-                       }
-                       else
-                       {
-                               if (deMemCmp(&expectedBytes.front(), outResourceMemories[outputNdx]->getHostPtr(), expectedBytes.size()))
-                                       return tcu::TestStatus::fail("Resource returned doesn't match bitwisely with expected");
-                       }
                }
        }