diff options
| author | John Kessenich <johnkslang@users.noreply.github.com> | 2019-05-12 18:24:42 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-12 18:24:42 +0700 |
| commit | 4b0985f29277a81f5ce88feb0502cc44d6d5e7c3 (patch) | |
| tree | 97d7b21c77a96cc81bf8a41c9bd7da92d4abb027 | |
| parent | 30ebd2f19c8d1e604bdeb3cbf9a16adf4c6df325 (diff) | |
| parent | 823750b5674f1629facbe98410bf02f96f985c64 (diff) | |
| download | platform_external_shaderc_spirv-headers-4b0985f29277a81f5ce88feb0502cc44d6d5e7c3.tar.gz platform_external_shaderc_spirv-headers-4b0985f29277a81f5ce88feb0502cc44d6d5e7c3.tar.bz2 platform_external_shaderc_spirv-headers-4b0985f29277a81f5ce88feb0502cc44d6d5e7c3.zip | |
Merge pull request #106 from alankemp/fix_json_writer
Compare enum names rather than values to determine last element
| -rw-r--r-- | include/spirv/unified1/spirv.json | 2 | ||||
| -rw-r--r-- | tools/buildHeaders/header.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json index 9dbbd83..2d5f6fb 100644 --- a/include/spirv/unified1/spirv.json +++ b/include/spirv/unified1/spirv.json @@ -481,7 +481,7 @@ "AliasedPointerEXT": 5356, "CounterBuffer": 5634, "HlslCounterBufferGOOGLE": 5634, - "HlslSemanticGOOGLE": 5635 + "HlslSemanticGOOGLE": 5635, "UserSemantic": 5635 } }, diff --git a/tools/buildHeaders/header.cpp b/tools/buildHeaders/header.cpp index 68a2929..f579eaf 100644 --- a/tools/buildHeaders/header.cpp +++ b/tools/buildHeaders/header.cpp @@ -347,7 +347,7 @@ namespace { bool printMax = (style != enumMask && maxEnum.size() > 0); for (const auto& v : sorted) - out << enumFmt(opPrefix, v, style, !printMax && v.first == sorted.back().first); + out << enumFmt(opPrefix, v, style, !printMax && v.second == sorted.back().second); if (printMax) out << maxEnum; |