From 1e8d59872f899e18e99620d6ca69f4f6febb8740 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Thu, 17 Oct 2019 11:11:04 -0400 Subject: [PATCH] Revert "Fixes VS num instances assumption" This reverts commit bac8df251bb6103d7844bfeacbb29bf14011b7cb. Change-Id: I60aa83d860b0b11ec7fc58fb97806635a1eebdca --- .../vktSpvAsmGraphicsShaderTestUtil.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp index e11d221..92c1edd 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp @@ -4069,25 +4069,9 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan vector 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(&expectedBytes.front()); - const float* outputFloats = reinterpret_cast(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"); - } } } -- 2.7.4