diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-06-07 14:00:31 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-06-09 08:48:10 -0600 |
| commit | 06ee14dc64a70613a5c2db54c1b8a670f6d6642b (patch) | |
| tree | be0d1d8f5f0e1ed91f156ceea462ab9050f76720 /scripts/parameter_validation_generator.py | |
| parent | 9fd722c87a9f47e9925e395200d3fec9c602b567 (diff) | |
| download | usermoji-06ee14dc64a70613a5c2db54c1b8a670f6d6642b.tar.xz | |
layers: Make PV GPA handling more consistent
Change-Id: I28d4642ca924928b9a76d6ddeb3a4e9ef106710b
Diffstat (limited to 'scripts/parameter_validation_generator.py')
| -rw-r--r-- | scripts/parameter_validation_generator.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py index 7d3b873d..eacace55 100644 --- a/scripts/parameter_validation_generator.py +++ b/scripts/parameter_validation_generator.py @@ -220,8 +220,8 @@ class ParamCheckerOutputGenerator(OutputGenerator): # Output declarations and record intercepted procedures write('// Declarations', file=self.outFile) write('\n'.join(self.declarations), file=self.outFile) - write('// Intercepts', file=self.outFile) - write('struct { const char* name; PFN_vkVoidFunction pFunc;} procmap[] = {', file=self.outFile) + write('// Map of all APIs to be intercepted by this layer', file=self.outFile) + write('static const std::unordered_map<std::string, void*> name_to_funcptr_map = {', file=self.outFile) write('\n'.join(self.intercepts), file=self.outFile) write('};\n', file=self.outFile) self.newline() @@ -437,7 +437,7 @@ class ParamCheckerOutputGenerator(OutputGenerator): if (self.featureExtraProtect != None): self.declarations += [ '#ifdef %s' % self.featureExtraProtect ] self.intercepts += [ '#ifdef %s' % self.featureExtraProtect ] - self.intercepts += [ ' {"%s", reinterpret_cast<PFN_vkVoidFunction>(%s)},' % (name,name[2:]) ] + self.intercepts += [ ' {"%s", (void*)%s},' % (name,name[2:]) ] decls = self.makeCDecls(cmdinfo.elem) # Strip off 'vk' from API name self.declarations += [ '%s' % decls[0].replace("VKAPI_CALL vk", "VKAPI_CALL ") ] |