layers: Fix printf formats
Add validation to printf format strings
diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 37d04df..3898b13 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -323,7 +323,6 @@
layer_data *my_instance_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map);
my_device_data->report_data = layer_debug_report_create_device(my_instance_data->report_data, *pDevice);
createDeviceRegisterExtensions(physicalDevice, pCreateInfo, *pDevice);
-
}
return result;
}
@@ -396,10 +395,8 @@
pPhysicalDevice->pInstance,
"VkInstance",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this VkInstance.",
- __FUNCTION__);
+ "%s() called even though the %s extension was not enabled for this VkInstance.",
+ __FUNCTION__, VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME);
}
if (VK_FALSE == skipCall) {
@@ -438,10 +435,8 @@
} else if (!pDevice->deviceSwapchainExtensionEnabled) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this VkDevice.",
- __FUNCTION__);
+ "%s() called even though the %s extension was not enabled for this VkDevice.",
+ __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
}
if (VK_FALSE == skipCall) {
@@ -475,10 +470,8 @@
} else if (!pDevice->deviceSwapchainExtensionEnabled) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this VkDevice.",
- __FUNCTION__);
+ "%s() called even though the %s extension was not enabled for this VkDevice.",
+ __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
}
if (VK_FALSE == skipCall) {
@@ -521,10 +514,8 @@
} else if (!pDevice->deviceSwapchainExtensionEnabled) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this VkDevice.",
- __FUNCTION__);
+ "%s() called even though the %s extension was not enabled for this VkDevice.",
+ __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
}
if (VK_FALSE == skipCall) {
@@ -575,10 +566,8 @@
} else if (!pDevice->deviceSwapchainExtensionEnabled) {
return LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this VkDevice.",
- fn);
+ "%s() called even though the %s extension was not enabled for this VkDevice.",
+ fn, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME );
}
// Validate pCreateInfo with the results for previous queries:
@@ -842,10 +831,8 @@
} else if (!pDevice->deviceSwapchainExtensionEnabled) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this VkDevice.",
- __FUNCTION__);
+ "%s() called even though the %s extension was not enabled for this VkDevice.",
+ __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
}
// Regardless of skipCall value, do some internal cleanup:
@@ -896,10 +883,8 @@
} else if (!pDevice->deviceSwapchainExtensionEnabled) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this VkDevice.",
- __FUNCTION__);
+ "%s() called even though the %s extension was not enabled for this VkDevice.",
+ __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
}
SwpSwapchain *pSwapchain = &my_data->swapchainMap[swapchain];
if (!pSwapchain) {
@@ -952,10 +937,8 @@
} else if (!pDevice->deviceSwapchainExtensionEnabled) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this VkDevice.",
- __FUNCTION__);
+ "%s() called even though the %s extension was not enabled for this VkDevice.",
+ __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
}
// Validate that a valid VkSwapchainKHR was used:
SwpSwapchain *pSwapchain = &my_data->swapchainMap[swapchain];
@@ -1028,11 +1011,8 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE,
pSwapchain->pDevice, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
- "%s() called even though the "
- VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME,
- "extension was not enabled for this "
- "VkDevice.",
- __FUNCTION__);
+ "%s() called even though the %s extension was not enabled for this VkDevice.",
+ __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
}
if (index >= pSwapchain->imageCount) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_SWAPCHAIN_KHR,