commit 2fecfc5b8f375656a89e06a85648c02c67ba9c4e
author Ben Clayton <bclayton@google.com> Thu Mar 12 12:46:00 2020 +0000
committer Ben Clayton <bclayton@google.com> Fri Mar 13 09:49:36 2020 +0000
tree 59cc45bc2e7095e1237b1e81409c05b4035378ab
parent da38401b6f48d95353f85a8104fed3781e7a3c80

SpirvShaderDebugger: Add string helper for debug kinds

Makes for easier reading of the assertion macros.

Bug: b/148401179
Change-Id: Icc48baa9c476967c6dea19c2f0e91ed253dce323
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/42194
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Pipeline/SpirvShaderDebugger.cpp

diff --git a/src/Pipeline/SpirvShaderDebugger.cpp b/src/Pipeline/SpirvShaderDebugger.cpp
index 08f4c05..3ede3ac 100644
--- a/src/Pipeline/SpirvShaderDebugger.cpp
+++ b/src/Pipeline/SpirvShaderDebugger.cpp
@@ -134,6 +134,32 @@
 	static constexpr bool kindof(Object::Kind kind) { return true; }
 };
 
+// cstr() returns the c-string name of the given Object::Kind.
+constexpr const char *cstr(Object::Kind k)
+{
+	switch(k)
+	{
+		case Object::Kind::Object: return "Object";
+		case Object::Kind::Declare: return "Declare";
+		case Object::Kind::Expression: return "Expression";
+		case Object::Kind::Function: return "Function";
+		case Object::Kind::InlinedAt: return "InlinedAt";
+		case Object::Kind::LocalVariable: return "LocalVariable";
+		case Object::Kind::Member: return "Member";
+		case Object::Kind::Operation: return "Operation";
+		case Object::Kind::Source: return "Source";
+		case Object::Kind::SourceScope: return "SourceScope";
+		case Object::Kind::Value: return "Value";
+		case Object::Kind::CompilationUnit: return "CompilationUnit";
+		case Object::Kind::LexicalBlock: return "LexicalBlock";
+		case Object::Kind::BasicType: return "BasicType";
+		case Object::Kind::VectorType: return "VectorType";
+		case Object::Kind::FunctionType: return "FunctionType";
+		case Object::Kind::CompositeType: return "CompositeType";
+	}
+	return "<unknown>";
+}
+
 template<typename TYPE_, typename BASE, Object::Kind KIND_>
 struct ObjectImpl : public BASE
 {
@@ -1044,8 +1070,8 @@
 	auto it = objects.find(debug::Object::ID(id.value()));
 	ASSERT_MSG(it != objects.end(), "Unknown debug object %d", id.value());
 	auto ptr = debug::cast<T>(it->second.get());
-	ASSERT_MSG(ptr, "Debug object %d is not of the correct type. Got: %d, want: %d",
-	           id.value(), int(it->second->kind), int(T::KIND));
+	ASSERT_MSG(ptr, "Debug object %d is not of the correct type. Got: %s, want: %s",
+	           id.value(), cstr(it->second->kind), cstr(T::KIND));
 	return ptr;
 }