From bf301faff7f013958051788f2f161003b1c22b59 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 17 May 2016 07:39:31 +0800 Subject: vk-layer-generate.py: assert valid instance/device in vkGet*ProcAddr "device" should be always valid in vkGetDeviceProcAddr. "instance" should be valid in vkGetInstanceProcAddr when the command is not intercepted by intercept_core_instance_command. --- vk-layer-generate.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/vk-layer-generate.py b/vk-layer-generate.py index ceb3d2b4..5f074477 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -551,9 +551,7 @@ class Subcommand(object): " addr = intercept_core_device_command(funcName);\n" " if (addr)\n" " return addr;\n" - " if (device == VK_NULL_HANDLE) {\n" - " return NULL;\n" - " }\n") + " assert(device);\n") for ext_enable, _ in extensions: func_body.append(' addr = intercept_%s_command(funcName, device);' % ext_enable) func_body.append(' if (addr)\n' @@ -593,9 +591,7 @@ class Subcommand(object): " if (addr) {\n" " return addr;\n" " }\n" - " if (instance == VK_NULL_HANDLE) {\n" - " return NULL;\n" - " }\n" + " assert(instance);\n" ) for ext_enable, _ in instance_extensions: @@ -619,9 +615,7 @@ class Subcommand(object): " addr = intercept_core_device_command(funcName);\n" " if (addr)\n" " return addr;" % self.layer_name) - func_body.append(" if (device == VK_NULL_HANDLE) {\n" - " return NULL;\n" - " }\n") + func_body.append(" assert(device);\n") func_body.append('') func_body.append(' VkLayerDispatchTable *pDisp = device_dispatch_table(device);') if 0 != len(extensions): @@ -653,9 +647,7 @@ class Subcommand(object): " addr = intercept_core_instance_command(funcName);\n" " if (addr)\n" " return addr;" % self.layer_name) - func_body.append(" if (instance == VK_NULL_HANDLE) {\n" - " return NULL;\n" - " }\n") + func_body.append(" assert(instance);\n") func_body.append("") func_body.append(" VkLayerInstanceDispatchTable* pTable = instance_dispatch_table(instance);\n") if 0 != len(instance_extensions): -- cgit v1.2.3