From 7fe0bf0c7a20b9c5d6774dc502a66c749a9a2d7d Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 8 Aug 2016 10:34:56 -0600 Subject: layers: Remove swapchain WRONG_STYPE checks This validation is already performed in parameter_validation. Change-Id: I0b9e83cf241bfa5de93c90898f6cd5b6d9b745b5 --- layers/swapchain.cpp | 36 ------------------------------------ layers/swapchain.h | 6 ------ 2 files changed, 42 deletions(-) diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp index aab545be..80907be2 100644 --- a/layers/swapchain.cpp +++ b/layers/swapchain.cpp @@ -345,10 +345,6 @@ CreateAndroidSurfaceKHR(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR VK_KHR_ANDROID_SURFACE_EXTENSION_NAME); } - if (pCreateInfo->sType != VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo", - "VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR"); - } if (pCreateInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo"); } @@ -404,10 +400,6 @@ CreateMirSurfaceKHR(VkInstance instance, const VkMirSurfaceCreateInfoKHR *pCreat VK_KHR_MIR_SURFACE_EXTENSION_NAME); } - if (pCreateInfo->sType != VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo", - "VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR"); - } if (pCreateInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo"); } @@ -499,10 +491,6 @@ CreateWaylandSurfaceKHR(VkInstance instance, const VkWaylandSurfaceCreateInfoKHR VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME); } - if (pCreateInfo->sType != VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo", - "VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR"); - } if (pCreateInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo"); } @@ -594,10 +582,6 @@ CreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *pC VK_KHR_WIN32_SURFACE_EXTENSION_NAME); } - if (pCreateInfo->sType != VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo", - "VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR"); - } if (pCreateInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo"); } @@ -687,10 +671,6 @@ CreateXcbSurfaceKHR(VkInstance instance, const VkXcbSurfaceCreateInfoKHR *pCreat VK_KHR_XCB_SURFACE_EXTENSION_NAME); } - if (pCreateInfo->sType != VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo", - "VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR"); - } if (pCreateInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo"); } @@ -782,10 +762,6 @@ CreateXlibSurfaceKHR(VkInstance instance, const VkXlibSurfaceCreateInfoKHR *pCre VK_KHR_XLIB_SURFACE_EXTENSION_NAME); } - if (pCreateInfo->sType != VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo", - "VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR"); - } if (pCreateInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo"); } @@ -1097,10 +1073,6 @@ CreateDisplayPlaneSurfaceKHR(VkInstance instance, const VkDisplaySurfaceCreateIn VK_KHR_DISPLAY_EXTENSION_NAME); } - if (pCreateInfo->sType != VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo", - "VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR"); - } if (pCreateInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo"); } @@ -1604,10 +1576,6 @@ static bool validateCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateI VK_KHR_SWAPCHAIN_EXTENSION_NAME); } - if (pCreateInfo->sType != VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo", - "VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR"); - } if (pCreateInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo"); } @@ -2177,10 +2145,6 @@ VKAPI_ATTR VkResult VKAPI_CALL QueuePresentKHR(VkQueue queue, const VkPresentInf bool skipCall = false; layer_data *my_data = get_my_data_ptr(get_dispatch_key(queue), layer_data_map); - if (pPresentInfo->sType != VK_STRUCTURE_TYPE_PRESENT_INFO_KHR) { - skipCall |= LOG_ERROR_WRONG_STYPE(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pPresentInfo", - "VK_STRUCTURE_TYPE_PRESENT_INFO_KHR"); - } if (pPresentInfo->pNext != NULL) { skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pPresentInfo"); } diff --git a/layers/swapchain.h b/layers/swapchain.h index f0028302..dcb130d9 100644 --- a/layers/swapchain.h +++ b/layers/swapchain.h @@ -84,12 +84,6 @@ const char * swapchain_layer_name = "Swapchain"; #define LAYER_NAME (char *) "Swapchain" -#define LOG_ERROR_WRONG_STYPE(objType, type, obj, val) \ - (my_data) ? log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (objType), (uint64_t)(obj), 0, SWAPCHAIN_WRONG_STYPE, \ - LAYER_NAME, "%s() called with the wrong value for %s->sType " \ - "(expected %s).", \ - __FUNCTION__, (obj), (val)) \ - : VK_FALSE #define LOG_ERROR_ZERO_VALUE(objType, type, obj) \ (my_data) ? log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (objType), (uint64_t)(obj), 0, SWAPCHAIN_ZERO_VALUE, \ LAYER_NAME, "%s() called with a zero value for %s.", __FUNCTION__, (obj)) \ -- cgit v1.2.3