From d0a64d5438a7355df2918c5311ea1c320530234a Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Sat, 31 Oct 2015 00:31:16 +0800
Subject: bug 15045: vkGetPhysicalDeviceImageFormatProperties for unsupported
 formats (WIP)

Change the return type of vkGetPhysicalDeviceImageFormatProperties.

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15045
---
 layers/param_checker.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'layers/param_checker.cpp')

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index dfb1f446..44f57e6f 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1865,7 +1865,8 @@ bool PostGetPhysicalDeviceImageFormatProperties(
     VkImageTiling tiling,
     VkImageUsageFlags usage,
     VkImageCreateFlags flags,
-    VkImageFormatProperties* pImageFormatProperties)
+    VkImageFormatProperties* pImageFormatProperties,
+    VkResult result)
 {
 
     if(format < VK_FORMAT_BEGIN_RANGE ||
@@ -1897,10 +1898,17 @@ bool PostGetPhysicalDeviceImageFormatProperties(
     {
     }
 
+    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 void VKAPI vkGetPhysicalDeviceImageFormatProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceImageFormatProperties(
     VkPhysicalDevice physicalDevice,
     VkFormat format,
     VkImageType type,
@@ -1909,9 +1917,11 @@ VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceImageFormatProperties(
     VkImageCreateFlags flags,
     VkImageFormatProperties* pImageFormatProperties)
 {
-    get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);
+    VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);
 
-    PostGetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);
+    PostGetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties, result);
+
+    return result;
 }
 
 bool PostGetPhysicalDeviceProperties(
-- 
cgit v1.2.3