Fix ComputeProgramKey not strict weak ordering

Example: ComputeProgramKey a, b; a.shader = 1; b.shader = 2; a.layout = 2; b.layout = 1; // This assertion will fail because a < b since a.shader < b.shader, // but also b < a because b.layout < a.layout. assert( (a < b) && !(b < a) ); Change-Id: I1061f517cee60a28a1f4239704655e9d320ade46 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/36348 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Antonio Maiorano <amaiorano@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Fix ComputeProgramKey not strict weak ordering
126d9d60 · Antonio Maiorano · e9b6f28f · 126d9d60
Commit 126d9d60 authored Sep 13, 2019 by Antonio Maiorano
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

VkPipelineCache.hpp src/Vulkan/VkPipelineCache.hpp +1 -1

No files found.
--- a/src/Vulkan/VkPipelineCache.hpp
+++ b/src/Vulkan/VkPipelineCache.hpp
@@ -105,7 +105,7 @@ public:
 		bool operator<(const ComputeProgramKey &other) const
 		{
-			return (shader < other.shader) || (layout < other.layout);
+			return std::tie(shader, layout) < std::tie(other.shader, other.layout);
 		}
 		const sw::SpirvShader* getShader() const { return shader; }