Add new debug macro UNSUPPORTED().

src/Vulkan/VkDebug.hpp

@@ -89,11 +89,22 @@ namespace vk
 		DABORT("ASSERT(%s)\n", #expression); \
 	} } while(0)
 
-// A macro to indicate unimplemented functionality.
+// A macro to indicate functionality currently unimplemented for a feature
+// advertised as supported. For unsupported features not advertised as supported
+// use UNSUPPORTED().
 #undef UNIMPLEMENTED
 #define UNIMPLEMENTED(format, ...) DABORT("UNIMPLEMENTED: " format, ##__VA_ARGS__)
 
-// A macro for code which is not expected to be reached under valid assumptions.
+// A macro to indicate unsupported functionality.
+// This should be called when a Vulkan / SPIR-V feature is attempted to be used,
+// but is not currently implemented by SwiftShader.
+// Note that in a well-behaved application these should not be reached as the
+// application should be respecting the advertised features / limits.
+#undef UNSUPPORTED
+#define UNSUPPORTED(format, ...) DABORT("UNSUPPORTED: " format, ##__VA_ARGS__)
+
+// A macro for code which should never be reached, even with misbehaving
+// applications.
 #undef UNREACHABLE
 #define UNREACHABLE(format, ...) DABORT("UNREACHABLE: " format, ##__VA_ARGS__)
 

tests/regres/main.go

@@ -1035,6 +1035,7 @@ func compare(old, new *CommitTestResults) string {
 		{"                 Fail", testlist.Fail},
 		{"              Timeout", testlist.Timeout},
 		{"      UNIMPLEMENTED()", testlist.Unimplemented},
+		{"        UNSUPPORTED()", testlist.Unsupported},
 		{"        UNREACHABLE()", testlist.Unreachable},
 		{"             ASSERT()", testlist.Assert},
 		{"              ABORT()", testlist.Abort},
@@ -1118,6 +1119,8 @@ var (
 	deqpRE = regexp.MustCompile(`(Fail|Pass|NotSupported|CompatibilityWarning|QualityWarning) \(([^\)]*)\)`)
 	// Regular expression to parse a test that failed due to UNIMPLEMENTED()
 	unimplementedRE = regexp.MustCompile(`[^\n]*UNIMPLEMENTED:[^\n]*`)
+	// Regular expression to parse a test that failed due to UNSUPPORTED()
+	unsupportedRE = regexp.MustCompile(`[^\n]*UNSUPPORTED\([^\)]*\):[^\n]*`)
 	// Regular expression to parse a test that failed due to UNREACHABLE()
 	unreachableRE = regexp.MustCompile(`[^\n]*UNREACHABLE:[^\n]*`)
 	// Regular expression to parse a test that failed due to ASSERT()
@@ -1159,6 +1162,7 @@ nextTest:
 				s  testlist.Status
 			}{
 				{unimplementedRE, testlist.Unimplemented},
+				{unsupportedRE, testlist.Unsupported},
 				{unreachableRE, testlist.Unreachable},
 				{assertRE, testlist.Assert},
 				{abortRE, testlist.Abort},

tests/regres/testlist/testlist.go

@@ -161,6 +161,8 @@ const (
 	Crash = Status("CRASH")
 	// Unimplemented is the status of a test that failed with UNIMPLEMENTED().
 	Unimplemented = Status("UNIMPLEMENTED")
+	// Unsupported is the status of a test that failed with UNSUPPORTED().
+	Unsupported = Status("UNSUPPORTED")
 	// Unreachable is the status of a test that failed with UNREACHABLE().
 	Unreachable = Status("UNREACHABLE")
 	// Assert is the status of a test that failed with ASSERT() or ASSERT_MSG().
@@ -182,6 +184,7 @@ var Statuses = []Status{
 	Timeout,
 	Crash,
 	Unimplemented,
+	Unsupported,
 	Unreachable,
 	Assert,
 	Abort,
@@ -195,6 +198,11 @@ func (s Status) Failing() bool {
 	switch s {
 	case Fail, Timeout, Crash, Unimplemented, Unreachable, Assert:
 		return true
+	case Unsupported:
+		// This may seem surprising that this should be a failure, however these
+		// should not be reached, as dEQP should not be using features that are
+		// not advertised.
+		return true
 	default:
 		return false
 	}