diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-05-05 16:18:18 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-17 19:47:01 -0600 |
| commit | ceec34de89a3ce1964b6aab8cb1d3013b6926ac5 (patch) | |
| tree | 6bec0fcd23c23e4ecc0df9aecb46c46dea05493f | |
| parent | 9508521d8aa9983d5127b90fbcc2fa6006a28f70 (diff) | |
| download | usermoji-ceec34de89a3ce1964b6aab8cb1d3013b6926ac5.tar.xz | |
layers: Remove the layer intercept proc generated header
This is no longer used by any layers; instead vk-layer-generate.py adds
this code.
| -rw-r--r-- | layers/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | vk-generate.py | 43 |
2 files changed, 0 insertions, 48 deletions
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index d4067fc2..c06b8b3d 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -56,10 +56,6 @@ add_custom_command(OUTPUT vk_dispatch_table_helper.h COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py dispatch-table-ops layer > vk_dispatch_table_helper.h DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py) -add_custom_command(OUTPUT vk_generic_intercept_proc_helper.h - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py layer-intercept-proc > vk_generic_intercept_proc_helper.h - DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py) - run_vk_helper(gen_enum_string_helper vk_enum_string_helper.h) run_vk_helper(gen_struct_wrappers vk_struct_string_helper.h @@ -75,7 +71,6 @@ run_vk_helper(gen_graphviz vk_struct_graphviz_helper.h) add_custom_target(generate_vk_layer_helpers DEPENDS vk_dispatch_table_helper.h - vk_generic_intercept_proc_helper.h vk_enum_string_helper.h vk_struct_string_helper.h vk_struct_string_helper_no_addr.h diff --git a/vk-generate.py b/vk-generate.py index 00327b75..be81e084 100755 --- a/vk-generate.py +++ b/vk-generate.py @@ -237,48 +237,6 @@ class IcdGetProcAddrSubcommand(IcdDummyEntrypointsSubcommand): return "\n".join(body) -class LayerInterceptProcSubcommand(Subcommand): - def run(self): - self.prefix = "vk" - - # we could get the list from argv if wanted - self.intercepted = [proto.name for proto in self.protos - if proto.name not in ["EnumeratePhysicalDevices", "GetInstanceProcAddr"]] - - for proto in self.protos: - if proto.name == "GetProcAddr": - self.gpa = proto - - super().run() - - def generate_header(self): - return "\n".join(["#include <string.h>", "#include \"vkLayer.h\""]) - - def generate_body(self): - lookups = [] - for proto in self.protos: - if proto.name not in self.intercepted: - lookups.append("/* no %s%s */" % (self.prefix, proto.name)) - continue - - lookups.append("if (!strcmp(name, \"%s\"))" % proto.name) - lookups.append(" return (%s) %s%s;" % - (self.gpa.ret, self.prefix, proto.name)) - - body = [] - body.append("static inline %s layer_intercept_proc(const char *name)" % - self.gpa.ret) - body.append("{") - body.append(generate_get_proc_addr_check("name")) - body.append("") - body.append(" name += 2;") - body.append(" %s" % "\n ".join(lookups)) - body.append("") - body.append(" return NULL;") - body.append("}") - - return "\n".join(body) - class WinDefFileSubcommand(Subcommand): def run(self): library_exports = { @@ -354,7 +312,6 @@ def main(): "dispatch-table-ops": DispatchTableOpsSubcommand, "icd-dummy-entrypoints": IcdDummyEntrypointsSubcommand, "icd-get-proc-addr": IcdGetProcAddrSubcommand, - "layer-intercept-proc": LayerInterceptProcSubcommand, "win-def-file": WinDefFileSubcommand, } |
