Bug 14621: Change vkGet* functions to not return VkResult
diff --git a/layers/basic.cpp b/layers/basic.cpp
index b90c075..778a362 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -119,12 +119,11 @@
destroy_instance_dispatch_table(key);
}
-VK_LAYER_EXPORT VkResult VKAPI basic_GetPhysicalDeviceFormatProperties(VkPhysicalDevice gpu, VkFormat format, VkFormatProperties *pFormatInfo)
+VK_LAYER_EXPORT void VKAPI basic_GetPhysicalDeviceFormatProperties(VkPhysicalDevice gpu, VkFormat format, VkFormatProperties *pFormatInfo)
{
printf("At start of wrapped vkGetPhysicalDeviceFormatProperties() call w/ gpu: %p\n", (void*)gpu);
- VkResult result = instance_dispatch_table(gpu)->GetPhysicalDeviceFormatProperties(gpu, format, pFormatInfo);
+ instance_dispatch_table(gpu)->GetPhysicalDeviceFormatProperties(gpu, format, pFormatInfo);
printf("Completed wrapped vkGetPhysicalDeviceFormatProperties() call w/ gpu: %p\n", (void*)gpu);
- return result;
}
VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice device, const char* pName)
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index 1c3018b..eded357 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -244,36 +244,31 @@
return VK_ERROR_VALIDATION_FAILED;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures)
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures)
{
layer_data *phy_dev_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map);
phy_dev_data->physicalDeviceState->vkGetPhysicalDeviceFeaturesState = QUERY_DETAILS;
- VkResult result = phy_dev_data->instance_dispatch_table->GetPhysicalDeviceFeatures(physicalDevice, pFeatures);
- return result;
+ phy_dev_data->instance_dispatch_table->GetPhysicalDeviceFeatures(physicalDevice, pFeatures);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties)
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties)
{
- VkResult result = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map)->instance_dispatch_table->GetPhysicalDeviceFormatProperties(
- physicalDevice, format, pFormatProperties);
- return result;
+ get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map)->instance_dispatch_table->GetPhysicalDeviceFormatProperties(
+ physicalDevice, format, pFormatProperties);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceImageFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties)
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceImageFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties)
{
- VkResult result = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map)->instance_dispatch_table->GetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);
- return result;
+ get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map)->instance_dispatch_table->GetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties)
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties)
{
layer_data *phy_dev_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map);
- VkResult result = phy_dev_data->instance_dispatch_table->GetPhysicalDeviceProperties(physicalDevice, pProperties);
-
- return result;
+ phy_dev_data->instance_dispatch_table->GetPhysicalDeviceProperties(physicalDevice, pProperties);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice physicalDevice, uint32_t* pCount, VkQueueFamilyProperties* pQueueFamilyProperties)
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice physicalDevice, uint32_t* pCount, VkQueueFamilyProperties* pQueueFamilyProperties)
{
VkBool32 skipCall = VK_FALSE;
layer_data *phy_dev_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map);
@@ -294,8 +289,8 @@
phy_dev_data->physicalDeviceState->vkGetPhysicalDeviceQueueFamilyPropertiesState = QUERY_DETAILS;
}
if (skipCall)
- return VK_ERROR_VALIDATION_FAILED;
- VkResult result = phy_dev_data->instance_dispatch_table->GetPhysicalDeviceQueueFamilyProperties(physicalDevice, pCount, pQueueFamilyProperties);
+ return;
+ phy_dev_data->instance_dispatch_table->GetPhysicalDeviceQueueFamilyProperties(physicalDevice, pCount, pQueueFamilyProperties);
if (NULL == pQueueFamilyProperties) {
phy_dev_data->physicalDeviceState->queueFamilyPropertiesCount = *pCount;
} else { // Save queue family properties
@@ -304,24 +299,21 @@
phy_dev_data->queueFamilyProperties.emplace_back(new VkQueueFamilyProperties(pQueueFamilyProperties[i]));
}
}
- return result;
+ return;
} else {
log_msg(phy_dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PHYSICAL_DEVICE, 0, 0, DEVLIMITS_INVALID_PHYSICAL_DEVICE, "DL",
"Invalid physicalDevice (%#" PRIxLEAST64 ") passed into vkGetPhysicalDeviceQueueFamilyProperties().", physicalDevice);
}
- return VK_ERROR_VALIDATION_FAILED;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties)
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties)
{
- VkResult result = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map)->instance_dispatch_table->GetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties);
- return result;
+ get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map)->instance_dispatch_table->GetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceSparseImageFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, uint32_t samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pNumProperties, VkSparseImageFormatProperties* pProperties)
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceSparseImageFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, uint32_t samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pNumProperties, VkSparseImageFormatProperties* pProperties)
{
- VkResult result = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map)->instance_dispatch_table->GetPhysicalDeviceSparseImageFormatProperties(physicalDevice, format, type, samples, usage, tiling, pNumProperties, pProperties);
- return result;
+ get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map)->instance_dispatch_table->GetPhysicalDeviceSparseImageFormatProperties(physicalDevice, format, type, samples, usage, tiling, pNumProperties, pProperties);
}
VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(
@@ -477,7 +469,7 @@
get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyCommandBuffer(device, commandBuffer);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue)
+VK_LAYER_EXPORT void VKAPI vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue)
{
VkBool32 skipCall = VK_FALSE;
layer_data *dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map);
@@ -491,9 +483,8 @@
"Invalid queue request in vkGetDeviceQueue(). QueueFamilyIndex %u only has %u queues, but requested queueIndex is %u.", queueFamilyIndex, phy_dev_data->queueFamilyProperties[queueFamilyIndex]->queueCount, queueIndex);
}
if (skipCall)
- return VK_ERROR_VALIDATION_FAILED;
- VkResult result = dev_data->device_dispatch_table->GetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);
- return result;
+ return;
+ dev_data->device_dispatch_table->GetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);
}
VK_LAYER_EXPORT VkResult VKAPI vkCreateImage(
diff --git a/layers/image.cpp b/layers/image.cpp
index 52800bf..736c44a 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -280,12 +280,8 @@
if(pCreateInfo->format != VK_FORMAT_UNDEFINED)
{
VkFormatProperties properties;
- VkResult result = get_dispatch_table(image_instance_table_map, device_data->physicalDevice)->GetPhysicalDeviceFormatProperties(
+ get_dispatch_table(image_instance_table_map, device_data->physicalDevice)->GetPhysicalDeviceFormatProperties(
device_data->physicalDevice, pCreateInfo->format, &properties);
- if(result != VK_SUCCESS) {
- char const str[] = "vkCreateImage parameter, VkFormat pCreateInfo->format, cannot be validated";
- skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_FORMAT_UNSUPPORTED, "IMAGE", str);
- }
if((properties.linearTilingFeatures) == 0 && (properties.optimalTilingFeatures == 0))
{
@@ -320,15 +316,8 @@
{
layer_data *device_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map);
VkFormatProperties properties;
- VkResult result = get_dispatch_table(image_instance_table_map, device_data->physicalDevice)->GetPhysicalDeviceFormatProperties(
+ get_dispatch_table(image_instance_table_map, device_data->physicalDevice)->GetPhysicalDeviceFormatProperties(
device_data->physicalDevice, pCreateInfo->pAttachments[i].format, &properties);
- if(result != VK_SUCCESS)
- {
- std::stringstream ss;
- ss << "vkCreateRenderPass parameter, VkFormat in pCreateInfo->pAttachments[" << i << "], cannot be validated";
- skipCall |= log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_FORMAT_UNSUPPORTED, "IMAGE", ss.str().c_str());
- continue;
- }
if((properties.linearTilingFeatures) == 0 && (properties.optimalTilingFeatures == 0))
{
@@ -725,19 +714,17 @@
}
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetImageSubresourceLayout(
+VK_LAYER_EXPORT void VKAPI vkGetImageSubresourceLayout(
VkDevice device,
VkImage image,
const VkImageSubresource *pSubresource,
VkSubresourceLayout *pLayout)
{
- VkResult result = get_dispatch_table(image_device_table_map, device)->GetImageSubresourceLayout(device,
+ get_dispatch_table(image_device_table_map, device)->GetImageSubresourceLayout(device,
image, pSubresource, pLayout);
// TODO: After state tracking for images/buffers is implemented, validate that returned aspects match
// the created formats -- color for color formats, depth|stencil for ds formats
-
- return result;
}
VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice device, const char* funcName)
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 5ca8184..4a1e85f 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1071,17 +1071,13 @@
assert(mem_tracker_device_table_map.size() == 0 && "Should not have any instance mappings hanging around");
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceMemoryProperties(
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceMemoryProperties(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties *pMemoryProperties)
{
VkLayerInstanceDispatchTable *pInstanceTable = get_dispatch_table(mem_tracker_instance_table_map, physicalDevice);
- VkResult result = pInstanceTable->GetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties);
- if (result == VK_SUCCESS) {
- // copy mem props to local var...
- memcpy(&memProps, pMemoryProperties, sizeof(VkPhysicalDeviceMemoryProperties));
- }
- return result;
+ pInstanceTable->GetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties);
+ memcpy(&memProps, pMemoryProperties, sizeof(VkPhysicalDeviceMemoryProperties));
}
static const VkLayerProperties mtGlobalLayers[] = {
@@ -1131,19 +1127,16 @@
pCount, pProperties);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetDeviceQueue(
+VK_LAYER_EXPORT void VKAPI vkGetDeviceQueue(
VkDevice device,
uint32_t queueNodeIndex,
uint32_t queueIndex,
VkQueue *pQueue)
{
- VkResult result = get_dispatch_table(mem_tracker_device_table_map, device)->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue);
- if (result == VK_SUCCESS) {
- loader_platform_thread_lock_mutex(&globalLock);
- add_queue_info(*pQueue);
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- return result;
+ get_dispatch_table(mem_tracker_device_table_map, device)->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue);
+ loader_platform_thread_lock_mutex(&globalLock);
+ add_queue_info(*pQueue);
+ loader_platform_thread_unlock_mutex(&globalLock);
}
VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit(
@@ -1321,26 +1314,24 @@
return result;
}
-VkResult VKAPI vkGetBufferMemoryRequirements(
+void VKAPI vkGetBufferMemoryRequirements(
VkDevice device,
VkBuffer buffer,
VkMemoryRequirements* pMemoryRequirements)
{
// TODO : What to track here?
// Could potentially save returned mem requirements and validate values passed into BindBufferMemory
- VkResult result = get_dispatch_table(mem_tracker_device_table_map, device)->GetBufferMemoryRequirements(device, buffer, pMemoryRequirements);
- return result;
+ get_dispatch_table(mem_tracker_device_table_map, device)->GetBufferMemoryRequirements(device, buffer, pMemoryRequirements);
}
-VkResult VKAPI vkGetImageMemoryRequirements(
+void VKAPI vkGetImageMemoryRequirements(
VkDevice device,
VkImage image,
VkMemoryRequirements* pMemoryRequirements)
{
// TODO : What to track here?
// Could potentially save returned mem requirements and validate values passed into BindImageMemory
- VkResult result = get_dispatch_table(mem_tracker_device_table_map, device)->GetImageMemoryRequirements(device, image, pMemoryRequirements);
- return result;
+ get_dispatch_table(mem_tracker_device_table_map, device)->GetImageMemoryRequirements(device, image, pMemoryRequirements);
}
VK_LAYER_EXPORT VkResult VKAPI vkQueueBindSparseImageOpaqueMemory(
diff --git a/layers/multi.cpp b/layers/multi.cpp
index 47b1ba5..1db6b6f 100644
--- a/layers/multi.cpp
+++ b/layers/multi.cpp
@@ -118,28 +118,24 @@
return result;
}
-VK_LAYER_EXPORT VkResult VKAPI multi2GetPhysicalDeviceProperties(
+VK_LAYER_EXPORT void VKAPI multi2GetPhysicalDeviceProperties(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties* pProperties)
{
VkLayerInstanceDispatchTable *pDisp = get_dispatch_table(multi2_instance_table_map, physicalDevice);
printf("At start of wrapped multi2 vkGetPhysicalDeviceProperties()\n");
- VkResult result = pDisp->GetPhysicalDeviceProperties(physicalDevice, pProperties);
+ pDisp->GetPhysicalDeviceProperties(physicalDevice, pProperties);
printf("Completed multi2 layer vkGetPhysicalDeviceProperties()\n");
-
- return result;
}
-VK_LAYER_EXPORT VkResult VKAPI multi2GetPhysicalDeviceFeatures(
+VK_LAYER_EXPORT void VKAPI multi2GetPhysicalDeviceFeatures(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures* pFeatures)
{
VkLayerInstanceDispatchTable *pDisp = get_dispatch_table(multi2_instance_table_map, physicalDevice);
printf("At start of wrapped multi2 vkGetPhysicalDeviceFeatures()\n");
- VkResult result = pDisp->GetPhysicalDeviceFeatures(physicalDevice, pFeatures);
+ pDisp->GetPhysicalDeviceFeatures(physicalDevice, pFeatures);
printf("Completed multi2 layer vkGetPhysicalDeviceFeatures()\n");
-
- return result;
}
/* hook DestroyInstance to remove tableInstanceMap entry */
diff --git a/layers/object_track.h b/layers/object_track.h
index dea2664..99ad2ea 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -655,19 +655,18 @@
return result;
}
-VkResult
+void
explicit_GetPhysicalDeviceQueueFamilyProperties(
VkPhysicalDevice gpu,
uint32_t* pCount,
VkQueueFamilyProperties* pProperties)
{
- VkResult result = get_dispatch_table(ObjectTracker_instance_table_map, gpu)->GetPhysicalDeviceQueueFamilyProperties(gpu, pCount, pProperties);
+ get_dispatch_table(ObjectTracker_instance_table_map, gpu)->GetPhysicalDeviceQueueFamilyProperties(gpu, pCount, pProperties);
loader_platform_thread_lock_mutex(&objLock);
if (pProperties != NULL)
setGpuQueueInfoState(*pCount, pProperties);
loader_platform_thread_unlock_mutex(&objLock);
- return result;
}
VkResult
@@ -714,7 +713,7 @@
return result;
}
-VkResult
+void
explicit_GetDeviceQueue(
VkDevice device,
uint32_t queueNodeIndex,
@@ -725,16 +724,12 @@
validate_object(device, device);
loader_platform_thread_unlock_mutex(&objLock);
- VkResult result = get_dispatch_table(ObjectTracker_device_table_map, device)->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue);
+ get_dispatch_table(ObjectTracker_device_table_map, device)->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue);
loader_platform_thread_lock_mutex(&objLock);
- if (VK_SUCCESS == result) {
- addQueueInfo(queueNodeIndex, *pQueue);
- create_obj(device, *pQueue, VK_OBJECT_TYPE_QUEUE);
- }
+ addQueueInfo(queueNodeIndex, *pQueue);
+ create_obj(device, *pQueue, VK_OBJECT_TYPE_QUEUE);
loader_platform_thread_unlock_mutex(&objLock);
-
- return result;
}
VkResult
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 4595325..de4890a 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1919,40 +1919,29 @@
bool PostGetPhysicalDeviceFeatures(
VkPhysicalDevice physicalDevice,
- VkPhysicalDeviceFeatures* pFeatures,
- VkResult result)
+ VkPhysicalDeviceFeatures* pFeatures)
{
if(pFeatures != nullptr)
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetPhysicalDeviceFeatures parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFeatures(
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceFeatures(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures* pFeatures)
{
- VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceFeatures(physicalDevice, pFeatures);
+ get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceFeatures(physicalDevice, pFeatures);
- PostGetPhysicalDeviceFeatures(physicalDevice, pFeatures, result);
-
- return result;
+ PostGetPhysicalDeviceFeatures(physicalDevice, pFeatures);
}
bool PostGetPhysicalDeviceFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
- VkFormatProperties* pFormatProperties,
- VkResult result)
+ VkFormatProperties* pFormatProperties)
{
if(format < VK_FORMAT_BEGIN_RANGE ||
@@ -1967,26 +1956,17 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetPhysicalDeviceFormatProperties parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatProperties(
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkFormatProperties* pFormatProperties)
{
- VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceFormatProperties(physicalDevice, format, pFormatProperties);
+ get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceFormatProperties(physicalDevice, format, pFormatProperties);
- PostGetPhysicalDeviceFormatProperties(physicalDevice, format, pFormatProperties, result);
-
- return result;
+ PostGetPhysicalDeviceFormatProperties(physicalDevice, format, pFormatProperties);
}
bool PostGetPhysicalDeviceImageFormatProperties(
@@ -1996,8 +1976,7 @@
VkImageTiling tiling,
VkImageUsageFlags usage,
VkImageCreateFlags flags,
- VkImageFormatProperties* pImageFormatProperties,
- VkResult result)
+ VkImageFormatProperties* pImageFormatProperties)
{
if(format < VK_FORMAT_BEGIN_RANGE ||
@@ -2029,17 +2008,10 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetPhysicalDeviceImageFormatProperties parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceImageFormatProperties(
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceImageFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkImageType type,
@@ -2048,17 +2020,14 @@
VkImageCreateFlags flags,
VkImageFormatProperties* pImageFormatProperties)
{
- VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);
+ get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);
- PostGetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties, result);
-
- return result;
+ PostGetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);
}
bool PostGetPhysicalDeviceProperties(
VkPhysicalDevice physicalDevice,
- VkPhysicalDeviceProperties* pProperties,
- VkResult result)
+ VkPhysicalDeviceProperties* pProperties)
{
if(pProperties != nullptr)
@@ -2072,32 +2041,22 @@
}
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetPhysicalDeviceProperties parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceProperties(
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceProperties(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties* pProperties)
{
- VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceProperties(physicalDevice, pProperties);
+ get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceProperties(physicalDevice, pProperties);
- PostGetPhysicalDeviceProperties(physicalDevice, pProperties, result);
-
- return result;
+ PostGetPhysicalDeviceProperties(physicalDevice, pProperties);
}
bool PostGetPhysicalDeviceQueueFamilyProperties(
VkPhysicalDevice physicalDevice,
uint32_t* pCount,
- VkQueueFamilyProperties* pQueueProperties,
- VkResult result)
+ VkQueueFamilyProperties* pQueueProperties)
{
if(pQueueProperties == nullptr && pCount != nullptr)
@@ -2108,13 +2067,6 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetPhysicalDeviceQueueFamilyProperties parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
@@ -2123,42 +2075,30 @@
uint32_t* pCount,
VkQueueFamilyProperties* pQueueProperties)
{
- VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceQueueFamilyProperties(physicalDevice, pCount, pQueueProperties);
+ get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceQueueFamilyProperties(physicalDevice, pCount, pQueueProperties);
- PostGetPhysicalDeviceQueueFamilyProperties(physicalDevice, pCount, pQueueProperties, result);
-
- return result;
+ PostGetPhysicalDeviceQueueFamilyProperties(physicalDevice, pCount, pQueueProperties);
}
bool PostGetPhysicalDeviceMemoryProperties(
VkPhysicalDevice physicalDevice,
- VkPhysicalDeviceMemoryProperties* pMemoryProperties,
- VkResult result)
+ VkPhysicalDeviceMemoryProperties* pMemoryProperties)
{
if(pMemoryProperties != nullptr)
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetPhysicalDeviceMemoryProperties parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceMemoryProperties(
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceMemoryProperties(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties* pMemoryProperties)
{
- VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties);
+ get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties);
- PostGetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties, result);
-
- return result;
+ PostGetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties);
}
VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(
@@ -2204,8 +2144,7 @@
VkDevice device,
uint32_t queueFamilyIndex,
uint32_t queueIndex,
- VkQueue* pQueue,
- VkResult result)
+ VkQueue* pQueue)
{
@@ -2214,27 +2153,18 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetDeviceQueue parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetDeviceQueue(
+VK_LAYER_EXPORT void VKAPI vkGetDeviceQueue(
VkDevice device,
uint32_t queueFamilyIndex,
uint32_t queueIndex,
VkQueue* pQueue)
{
- VkResult result = get_dispatch_table(pc_device_table_map, device)->GetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);
+ get_dispatch_table(pc_device_table_map, device)->GetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);
- PostGetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue, result);
-
- return result;
+ PostGetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);
}
bool PreQueueSubmit(
@@ -2525,8 +2455,7 @@
bool PostGetDeviceMemoryCommitment(
VkDevice device,
VkDeviceMemory memory,
- VkDeviceSize* pCommittedMemoryInBytes,
- VkResult result)
+ VkDeviceSize* pCommittedMemoryInBytes)
{
@@ -2534,26 +2463,17 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetDeviceMemoryCommitment parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetDeviceMemoryCommitment(
+VK_LAYER_EXPORT void VKAPI vkGetDeviceMemoryCommitment(
VkDevice device,
VkDeviceMemory memory,
VkDeviceSize* pCommittedMemoryInBytes)
{
- VkResult result = get_dispatch_table(pc_device_table_map, device)->GetDeviceMemoryCommitment(device, memory, pCommittedMemoryInBytes);
+ get_dispatch_table(pc_device_table_map, device)->GetDeviceMemoryCommitment(device, memory, pCommittedMemoryInBytes);
- PostGetDeviceMemoryCommitment(device, memory, pCommittedMemoryInBytes, result);
-
- return result;
+ PostGetDeviceMemoryCommitment(device, memory, pCommittedMemoryInBytes);
}
bool PostBindBufferMemory(
@@ -2627,8 +2547,7 @@
bool PostGetBufferMemoryRequirements(
VkDevice device,
VkBuffer buffer,
- VkMemoryRequirements* pMemoryRequirements,
- VkResult result)
+ VkMemoryRequirements* pMemoryRequirements)
{
@@ -2636,33 +2555,23 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetBufferMemoryRequirements parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetBufferMemoryRequirements(
+VK_LAYER_EXPORT void VKAPI vkGetBufferMemoryRequirements(
VkDevice device,
VkBuffer buffer,
VkMemoryRequirements* pMemoryRequirements)
{
- VkResult result = get_dispatch_table(pc_device_table_map, device)->GetBufferMemoryRequirements(device, buffer, pMemoryRequirements);
+ get_dispatch_table(pc_device_table_map, device)->GetBufferMemoryRequirements(device, buffer, pMemoryRequirements);
- PostGetBufferMemoryRequirements(device, buffer, pMemoryRequirements, result);
-
- return result;
+ PostGetBufferMemoryRequirements(device, buffer, pMemoryRequirements);
}
bool PostGetImageMemoryRequirements(
VkDevice device,
VkImage image,
- VkMemoryRequirements* pMemoryRequirements,
- VkResult result)
+ VkMemoryRequirements* pMemoryRequirements)
{
@@ -2670,34 +2579,24 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetImageMemoryRequirements parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetImageMemoryRequirements(
+VK_LAYER_EXPORT void VKAPI vkGetImageMemoryRequirements(
VkDevice device,
VkImage image,
VkMemoryRequirements* pMemoryRequirements)
{
- VkResult result = get_dispatch_table(pc_device_table_map, device)->GetImageMemoryRequirements(device, image, pMemoryRequirements);
+ get_dispatch_table(pc_device_table_map, device)->GetImageMemoryRequirements(device, image, pMemoryRequirements);
- PostGetImageMemoryRequirements(device, image, pMemoryRequirements, result);
-
- return result;
+ PostGetImageMemoryRequirements(device, image, pMemoryRequirements);
}
bool PostGetImageSparseMemoryRequirements(
VkDevice device,
VkImage image,
uint32_t* pNumRequirements,
- VkSparseImageMemoryRequirements* pSparseMemoryRequirements,
- VkResult result)
+ VkSparseImageMemoryRequirements* pSparseMemoryRequirements)
{
@@ -2716,27 +2615,18 @@
}
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetImageSparseMemoryRequirements parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetImageSparseMemoryRequirements(
+VK_LAYER_EXPORT void VKAPI vkGetImageSparseMemoryRequirements(
VkDevice device,
VkImage image,
uint32_t* pNumRequirements,
VkSparseImageMemoryRequirements* pSparseMemoryRequirements)
{
- VkResult result = get_dispatch_table(pc_device_table_map, device)->GetImageSparseMemoryRequirements(device, image, pNumRequirements, pSparseMemoryRequirements);
+ get_dispatch_table(pc_device_table_map, device)->GetImageSparseMemoryRequirements(device, image, pNumRequirements, pSparseMemoryRequirements);
- PostGetImageSparseMemoryRequirements(device, image, pNumRequirements, pSparseMemoryRequirements, result);
-
- return result;
+ PostGetImageSparseMemoryRequirements(device, image, pNumRequirements, pSparseMemoryRequirements);
}
bool PostGetPhysicalDeviceSparseImageFormatProperties(
@@ -2747,8 +2637,7 @@
VkImageUsageFlags usage,
VkImageTiling tiling,
uint32_t* pNumProperties,
- VkSparseImageFormatProperties* pProperties,
- VkResult result)
+ VkSparseImageFormatProperties* pProperties)
{
if(format < VK_FORMAT_BEGIN_RANGE ||
@@ -2792,17 +2681,10 @@
}
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetPhysicalDeviceSparseImageFormatProperties parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceSparseImageFormatProperties(
+VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceSparseImageFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkImageType type,
@@ -2812,11 +2694,9 @@
uint32_t* pNumProperties,
VkSparseImageFormatProperties* pProperties)
{
- VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceSparseImageFormatProperties(physicalDevice, format, type, samples, usage, tiling, pNumProperties, pProperties);
+ get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceSparseImageFormatProperties(physicalDevice, format, type, samples, usage, tiling, pNumProperties, pProperties);
- PostGetPhysicalDeviceSparseImageFormatProperties(physicalDevice, format, type, samples, usage, tiling, pNumProperties, pProperties, result);
-
- return result;
+ PostGetPhysicalDeviceSparseImageFormatProperties(physicalDevice, format, type, samples, usage, tiling, pNumProperties, pProperties);
}
bool PreQueueBindSparseBufferMemory(
@@ -3701,8 +3581,7 @@
bool PostGetImageSubresourceLayout(
VkDevice device,
VkImage image,
- VkSubresourceLayout* pLayout,
- VkResult result)
+ VkSubresourceLayout* pLayout)
{
@@ -3710,17 +3589,10 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetImageSubresourceLayout parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetImageSubresourceLayout(
+VK_LAYER_EXPORT void VKAPI vkGetImageSubresourceLayout(
VkDevice device,
VkImage image,
const VkImageSubresource* pSubresource,
@@ -3728,11 +3600,9 @@
{
PreGetImageSubresourceLayout(device, pSubresource);
- VkResult result = get_dispatch_table(pc_device_table_map, device)->GetImageSubresourceLayout(device, image, pSubresource, pLayout);
+ get_dispatch_table(pc_device_table_map, device)->GetImageSubresourceLayout(device, image, pSubresource, pLayout);
- PostGetImageSubresourceLayout(device, image, pLayout, result);
-
- return result;
+ PostGetImageSubresourceLayout(device, image, pLayout);
}
bool PreCreateImageView(
@@ -5218,8 +5088,7 @@
bool PostGetRenderAreaGranularity(
VkDevice device,
VkRenderPass renderPass,
- VkExtent2D* pGranularity,
- VkResult result)
+ VkExtent2D* pGranularity)
{
@@ -5227,26 +5096,17 @@
{
}
- if(result < VK_SUCCESS)
- {
- std::string reason = "vkGetRenderAreaGranularity parameter, VkResult result, is " + EnumeratorString(result);
- log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
- return false;
- }
-
return true;
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetRenderAreaGranularity(
+VK_LAYER_EXPORT void VKAPI vkGetRenderAreaGranularity(
VkDevice device,
VkRenderPass renderPass,
VkExtent2D* pGranularity)
{
- VkResult result = get_dispatch_table(pc_device_table_map, device)->GetRenderAreaGranularity(device, renderPass, pGranularity);
+ get_dispatch_table(pc_device_table_map, device)->GetRenderAreaGranularity(device, renderPass, pGranularity);
- PostGetRenderAreaGranularity(device, renderPass, pGranularity, result);
-
- return result;
+ PostGetRenderAreaGranularity(device, renderPass, pGranularity);
}
bool PreCreateCommandPool(
diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp
index ac3e20d..c468257 100644
--- a/layers/screenshot.cpp
+++ b/layers/screenshot.cpp
@@ -210,13 +210,11 @@
err = pTableDevice->CreateImage(device, &imgCreateInfo, &image2);
assert(!err);
- err = pTableDevice->GetImageMemoryRequirements(device, image2, &memRequirements);
- assert(!err);
+ pTableDevice->GetImageMemoryRequirements(device, image2, &memRequirements);
memAllocInfo.allocationSize = memRequirements.size;
pInstanceTable = instance_dispatch_table(instance);
- err = pInstanceTable->GetPhysicalDeviceMemoryProperties(physicalDevice, &memory_properties);
- assert(!err);
+ pInstanceTable->GetPhysicalDeviceMemoryProperties(physicalDevice, &memory_properties);
err = memory_type_from_properties(&memory_properties,
memRequirements.memoryTypeBits,
@@ -255,8 +253,7 @@
err = pTableDevice->DeviceWaitIdle(device);
assert(!err);
- err = pTableDevice->GetImageSubresourceLayout(device, image2, &sr, &sr_layout);
- assert(!err);
+ pTableDevice->GetImageSubresourceLayout(device, image2, &sr, &sr_layout);
err = pTableDevice->MapMemory(device, mem2, 0, 0, 0, (void **) &ptr );
assert(!err);
@@ -422,35 +419,32 @@
pCount, pProperties);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetDeviceQueue(
+VK_LAYER_EXPORT void VKAPI vkGetDeviceQueue(
VkDevice device,
uint32_t queueNodeIndex,
uint32_t queueIndex,
VkQueue *pQueue)
{
VkLayerDispatchTable* pTable = screenshot_device_table_map[device];
- VkResult result = get_dispatch_table(screenshot_device_table_map, device)->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue);
+ get_dispatch_table(screenshot_device_table_map, device)->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue);
loader_platform_thread_lock_mutex(&globalLock);
if (screenshotEnvQueried && screenshotFrames.empty()) {
// We are all done taking screenshots, so don't do anything else
loader_platform_thread_unlock_mutex(&globalLock);
- return result;
+ return;
}
- if (result == VK_SUCCESS) {
- screenshot_device_table_map.emplace(*pQueue, pTable);
+ screenshot_device_table_map.emplace(*pQueue, pTable);
- // Create a mapping from a device to a queue
- if (deviceMap[device] == NULL)
- {
- DeviceMapStruct *deviceMapElem = new DeviceMapStruct;
- deviceMap[device] = deviceMapElem;
- }
- deviceMap[device]->queue = *pQueue;
+ // Create a mapping from a device to a queue
+ if (deviceMap[device] == NULL)
+ {
+ DeviceMapStruct *deviceMapElem = new DeviceMapStruct;
+ deviceMap[device] = deviceMapElem;
}
+ deviceMap[device]->queue = *pQueue;
loader_platform_thread_unlock_mutex(&globalLock);
- return result;
}
VK_LAYER_EXPORT VkResult VKAPI vkCreateCommandPool(