Merge pull request #263 from ChristophHaag/print_expected

rpavlik · web-flow · commit 88174209ad51 · 2021-07-19T17:00:09.000-05:00
layers/core_validation: Actually print expected structure type
diff --git a/changes/sdk/pr.263.gh.OpenXR-SDK-Source.md b/changes/sdk/pr.263.gh.OpenXR-SDK-Source.md
@@ -0,0 +1,2 @@
+validation layer: Fix invalid struct type error message to show the expected
+type instead of the actual type.
diff --git a/src/api_layers/core_validation.cpp b/src/api_layers/core_validation.cpp
@@ -415,7 +415,7 @@ void InvalidStructureType(GenValidUsageXrInstanceInfo *instance_info, const std:
     oss_type << structure_name << " has an invalid XrStructureType ";
     oss_type << Uint32ToHexString(static_cast<uint32_t>(type));
     if (expected != 0) {
-        oss_type << ", expected " << Uint32ToHexString(static_cast<uint32_t>(type));
+        oss_type << ", expected " << Uint32ToHexString(static_cast<uint32_t>(expected));
         oss_type << " (" << expected_name << ")";
     }
     if (vuid != nullptr) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+validation layer: Fix invalid struct type error message to show the expected`
	`2`	`+type instead of the actual type.`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ void InvalidStructureType(GenValidUsageXrInstanceInfo *instance_info, const std:`
`415`	`415`	`oss_type << structure_name << " has an invalid XrStructureType ";`
`416`	`416`	`oss_type << Uint32ToHexString(static_cast<uint32_t>(type));`
`417`	`417`	`if (expected != 0) {`
`418`		`- oss_type << ", expected " << Uint32ToHexString(static_cast<uint32_t>(type));`
	`418`	`+ oss_type << ", expected " << Uint32ToHexString(static_cast<uint32_t>(expected));`
`419`	`419`	`oss_type << " (" << expected_name << ")";`
`420`	`420`	`}`
`421`	`421`	`if (vuid != nullptr) {`