commit 6287c18b1d249152563f0cb2d5cb0c6d0eb9e3d6
author Sean Risser <srisser@google.com> Tue Sep 01 14:10:09 2020 -0400
committer Sean Risser <srisser@google.com> Wed Sep 02 15:38:22 2020 +0000
tree a8726a5a5104b6c2e0eb23f85149f11869308fec
parent e1051cbaad46dc98967bee2e00a697d7f82b6658

Fix enum-hashing build error on Ubuntu 16.04

Due to a defect in older versions of libstdc++, the std library could
not support hashing of enums. So each enum used in a hash is now
explicitly used as a uint32_t.

Bug: b/166302706
Change-Id: Id7de96f97bef0e6f104dc783115a416e3aa47b7c
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/48108
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Sean Risser <srisser@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Pipeline/SpirvShader.hpp

diff --git a/src/Pipeline/SpirvShader.hpp b/src/Pipeline/SpirvShader.hpp
index b8f4f40..fb8ad86 100644
--- a/src/Pipeline/SpirvShader.hpp
+++ b/src/Pipeline/SpirvShader.hpp
@@ -800,7 +800,7 @@
 	HandleMap<Function> functions;
 	std::unordered_map<StringID, String> strings;
 	HandleMap<Extension> extensionsByID;
-	std::unordered_set<Extension::Name> extensionsImported;
+	std::unordered_set<uint32_t> extensionsImported;
 	Function::ID entryPoint;
 	mutable bool imageWriteEmitted = false;