From 1cb5bd60db3ca4f449f75bd935444fbcd4ead5de Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Tue, 15 Sep 2015 11:55:46 -0600 Subject: layers: Check if CreateDevice enabling WSI device extension, not instance Some of the layers were checking whether VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME (the WSI instance extension) is in the list of device extensions being enabled. This is wrong. They should be checking whether VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME (the WSI device extension) is in the list of device extensions being enabled. --- vk-layer-generate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vk-layer-generate.py b/vk-layer-generate.py index a02e29d3..2f4662f5 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -600,7 +600,7 @@ class GenericLayerSubcommand(Subcommand): gen_header.append(' VkLayerDispatchTable *pDisp = device_dispatch_table(device);') gen_header.append(' deviceExtMap[pDisp].wsi_enabled = false;') gen_header.append(' for (i = 0; i < pCreateInfo->extensionCount; i++) {') - gen_header.append(' if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME) == 0)') + gen_header.append(' if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME) == 0)') gen_header.append(' deviceExtMap[pDisp].wsi_enabled = true;') gen_header.append('') gen_header.append(' }') @@ -780,7 +780,7 @@ class APIDumpSubcommand(Subcommand): header_txt.append(' VkLayerDispatchTable *pDisp = device_dispatch_table(device);') header_txt.append(' deviceExtMap[pDisp].wsi_enabled = false;') header_txt.append(' for (i = 0; i < pCreateInfo->extensionCount; i++) {') - header_txt.append(' if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME) == 0)') + header_txt.append(' if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME) == 0)') header_txt.append(' deviceExtMap[pDisp].wsi_enabled = true;') header_txt.append('') header_txt.append(' }') -- cgit v1.2.3