layers: Removing old GetExtensionSupport API call
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 2af7eb9..a74b4eb 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -258,28 +258,6 @@
ggei_body.append('}')
return "\n".join(ggei_body)
- def _gen_layer_get_extension_support(self, layer="Generic"):
- ges_body = []
- ges_body.append('VK_LAYER_EXPORT VkResult VKAPI xglGetExtensionSupport(VkPhysicalGpu gpu, const char* pExtName)')
- ges_body.append('{')
- ges_body.append(' VkResult result;')
- ges_body.append(' VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu;')
- ges_body.append('')
- ges_body.append(' /* This entrypoint is NOT going to init its own dispatch table since loader calls here early */')
- ges_body.append(' if (!strncmp(pExtName, "%s", strlen("%s")))' % (layer, layer))
- ges_body.append(' {')
- ges_body.append(' result = VK_SUCCESS;')
- ges_body.append(' } else if (nextTable.GetExtensionSupport != NULL)')
- ges_body.append(' {')
- ges_body.append(' result = nextTable.GetExtensionSupport((VkPhysicalGpu)gpuw->nextObject, pExtName);')
- ges_body.append(' } else')
- ges_body.append(' {')
- ges_body.append(' result = VK_ERROR_INVALID_EXTENSION;')
- ges_body.append(' }')
- ges_body.append(' return result;')
- ges_body.append('}')
- return "\n".join(ges_body)
-
def _generate_dispatch_entrypoints(self, qual=""):
if qual:
qual += " "
@@ -297,8 +275,6 @@
intercept = self._gen_layer_dbg_callback_register()
elif 'DbgUnregisterMsgCallback' == proto.name:
intercept = self._gen_layer_dbg_callback_unregister()
- elif 'GetExtensionSupport' == proto.name:
- funcs.append(self._gen_layer_get_extension_support(self.layer_name))
elif 'GetGlobalExtensionInfo' == proto.name:
funcs.append(self._gen_layer_get_global_extension_info(self.layer_name))
if intercept is not None:
@@ -475,7 +451,7 @@
return '#include <stdio.h>\n#include <stdlib.h>\n#include <string.h>\n#include "loader_platform.h"\n#include "vkLayer.h"\n//The following is #included again to catch certain OS-specific functions being used:\n#include "loader_platform.h"\n\n#include "layers_config.h"\n#include "layers_msg.h"\n\nstatic VkLayerDispatchTable nextTable;\nstatic VkBaseLayerObject *pCurObj;\n\nstatic LOADER_PLATFORM_THREAD_ONCE_DECLARATION(tabOnce);'
def generate_intercept(self, proto, qual):
- if proto.name in [ 'DbgRegisterMsgCallback', 'DbgUnregisterMsgCallback' , 'GetExtensionSupport', 'GetGlobalExtensionInfo']:
+ if proto.name in [ 'DbgRegisterMsgCallback', 'DbgUnregisterMsgCallback' , 'GetGlobalExtensionInfo']:
# use default version
return None
decl = proto.c_func(prefix="vk", attr="VKAPI")
@@ -774,36 +750,6 @@
' return VK_SUCCESS;\n'
' }\n'
'}' % (qual, decl, self.layer_name, ret_val, proto.c_call(),f_open, log_func, f_close, stmt, self.layer_name))
- elif 'GetExtensionSupport' == proto.name:
- funcs.append('%s%s\n'
- '{\n'
- ' VkResult result;\n'
- ' /* This entrypoint is NOT going to init its own dispatch table since loader calls here early */\n'
- ' if (!strncmp(pExtName, "%s", strlen("%s")))\n'
- ' {\n'
- ' result = VK_SUCCESS;\n'
- ' } else if (nextTable.GetExtensionSupport != NULL)\n'
- ' {\n'
- ' result = nextTable.%s;\n'
- ' %s %s %s\n'
- ' } else\n'
- ' {\n'
- ' result = VK_ERROR_INVALID_EXTENSION;\n'
- ' }\n'
- '%s'
- '}' % (qual, decl, self.layer_name, self.layer_name, proto.c_call(), f_open, log_func, f_close, stmt))
-# elif 'vkphysicalgpu' == proto.params[0].ty.lower():
-# c_call = proto.c_call().replace("(" + proto.params[0].name, "((VkPhysicalGpu)gpuw->nextObject", 1)
-# funcs.append('%s%s\n'
-# '{\n'
-# ' using namespace StreamControl;\n'
-# ' VkBaseLayerObject* gpuw = (VkBaseLayerObject *) %s;\n'
-# ' pCurObj = gpuw;\n'
-# ' loader_platform_thread_once(&tabOnce, init%s);\n'
-# ' %snextTable.%s;\n'
-# ' %s%s%s\n'
-# '%s'
-# '}' % (qual, decl, proto.params[0].name, self.layer_name, ret_val, c_call, f_open, log_func, f_close, stmt))
else:
funcs.append('%s%s\n'
'{\n'
@@ -1254,26 +1200,6 @@
' return VK_SUCCESS;\n'
' }\n'
'}' % (qual, decl, using_line, self.layer_name, ret_val, proto.c_call(), create_line, destroy_line, stmt, self.layer_name))
- elif 'GetExtensionSupport' == proto.name:
- funcs.append('%s%s\n'
- '{\n'
- ' VkResult result;\n'
- ' /* This entrypoint is NOT going to init its own dispatch table since loader calls this early */\n'
- ' if (!strncmp(pExtName, "%s", strlen("%s")) ||\n'
- ' !strncmp(pExtName, "objTrackGetObjectCount", strlen("objTrackGetObjectCount")) ||\n'
- ' !strncmp(pExtName, "objTrackGetObjects", strlen("objTrackGetObjects")))\n'
- ' {\n'
- ' result = VK_SUCCESS;\n'
- ' } else if (nextTable.GetExtensionSupport != NULL)\n'
- ' {\n'
- ' %s'
- ' result = nextTable.%s;\n'
- ' } else\n'
- ' {\n'
- ' result = VK_ERROR_INVALID_EXTENSION;\n'
- ' }\n'
- '%s'
- '}' % (qual, decl, self.layer_name, self.layer_name, using_line, proto.c_call(), stmt))
elif 'GetGpuInfo' in proto.name:
gpu_state = ' if (infoType == VK_INFO_TYPE_PHYSICAL_GPU_QUEUE_PROPERTIES) {\n'
gpu_state += ' if (pData != NULL) {\n'