From 56a7e020561af357f052e15cce8fd2bdaeabf44b Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Wed, 11 Mar 2020 03:00:13 -0400 Subject: [PATCH] Use strcmp for all of the extended instruction set checks in the disassembler (#2107) Fixes #2106 * Convert memcmps to strcmps --- SPIRV/disassemble.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SPIRV/disassemble.cpp b/SPIRV/disassemble.cpp index 5b30a66..4faa89e 100644 --- a/SPIRV/disassemble.cpp +++ b/SPIRV/disassemble.cpp @@ -481,9 +481,11 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode, if (opCode == OpExtInst) { ExtInstSet extInstSet = GLSL450Inst; const char* name = idDescriptor[stream[word - 2]].c_str(); - if (0 == memcmp("OpenCL", name, 6)) { + if (strcmp("OpenCL.std", name) == 0) { extInstSet = OpenCLExtInst; - } else if (0 == memcmp("NonSemantic.DebugPrintf", name, 23)) { + } else if (strcmp("OpenCL.DebugInfo.100", name) == 0) { + extInstSet = OpenCLExtInst; + } else if (strcmp("NonSemantic.DebugPrintf", name) == 0) { extInstSet = NonSemanticDebugPrintfExtInst; } else if (strcmp(spv::E_SPV_AMD_shader_ballot, name) == 0 || strcmp(spv::E_SPV_AMD_shader_trinary_minmax, name) == 0 || -- 2.7.4