From ecd09a276297c685aa417cc1af3a46eb0e929b75 Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Mon, 8 Aug 2016 11:23:58 -0600
Subject: [PATCH] layers: Removed swapchain pNext validation

This validation is already performed in parameter_validation.

Change-Id: I5fd8e92c885300aa35537d825ea67fabb723062e
---
 layers/swapchain.cpp | 35 -----------------------------------
 layers/swapchain.h   |  5 -----
 2 files changed, 40 deletions(-)

diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index e798a3d..ee3a9fd 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -357,10 +357,6 @@ CreateAndroidSurfaceKHR(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR
                             "vkCreateAndroidSurfaceKHR() called even though the %s extension was not enabled for this VkInstance.",
                             VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
     }
-
-    if (pCreateInfo->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo");
-    }
     lock.unlock();
 
     if (!skipCall) {
@@ -412,10 +408,6 @@ CreateMirSurfaceKHR(VkInstance instance, const VkMirSurfaceCreateInfoKHR *pCreat
                             "vkCreateMirSurfaceKHR() called even though the %s extension was not enabled for this VkInstance.",
                             VK_KHR_MIR_SURFACE_EXTENSION_NAME);
     }
-
-    if (pCreateInfo->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo");
-    }
     lock.unlock();
 
     if (!skipCall) {
@@ -502,10 +494,6 @@ CreateWaylandSurfaceKHR(VkInstance instance, const VkWaylandSurfaceCreateInfoKHR
             "vkCreateWaylandSurfaceKHR() called even though the %s extension was not enabled for this VkInstance.",
             VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
     }
-
-    if (pCreateInfo->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo");
-    }
     lock.unlock();
 
     if (!skipCall) {
@@ -592,10 +580,6 @@ CreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *pC
                             "vkCreateWin32SurfaceKHR() called even though the %s extension was not enabled for this VkInstance.",
                             VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
     }
-
-    if (pCreateInfo->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo");
-    }
     lock.unlock();
 
     if (!skipCall) {
@@ -680,10 +664,6 @@ CreateXcbSurfaceKHR(VkInstance instance, const VkXcbSurfaceCreateInfoKHR *pCreat
                             "vkCreateXcbSurfaceKHR() called even though the %s extension was not enabled for this VkInstance.",
                             VK_KHR_XCB_SURFACE_EXTENSION_NAME);
     }
-
-    if (pCreateInfo->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo");
-    }
     lock.unlock();
 
     if (!skipCall) {
@@ -770,10 +750,6 @@ CreateXlibSurfaceKHR(VkInstance instance, const VkXlibSurfaceCreateInfoKHR *pCre
                             "vkCreateXlibSurfaceKHR() called even though the %s extension was not enabled for this VkInstance.",
                             VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
     }
-
-    if (pCreateInfo->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo");
-    }
     lock.unlock();
 
     if (!skipCall) {
@@ -1083,10 +1059,6 @@ CreateDisplayPlaneSurfaceKHR(VkInstance instance, const VkDisplaySurfaceCreateIn
                     VK_KHR_DISPLAY_EXTENSION_NAME);
     }
 
-    if (pCreateInfo->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo");
-    }
-
     // TODO more validation checks
     if (!skipCall) {
         // Call down the call chain:
@@ -1585,10 +1557,6 @@ static bool validateCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateI
                        VK_KHR_SWAPCHAIN_EXTENSION_NAME);
     }
 
-    if (pCreateInfo->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pCreateInfo");
-    }
-
     // Keep around a useful pointer to pPhysicalDevice:
     SwpPhysicalDevice *pPhysicalDevice = pDevice->pPhysicalDevice;
 
@@ -2151,9 +2119,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->pNext != NULL) {
-        skipCall |= LOG_INFO_WRONG_NEXT(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, "pPresentInfo");
-    }
     // Note: pPresentInfo->pResults is allowed to be NULL
 
     std::unique_lock<std::mutex> lock(global_lock);
diff --git a/layers/swapchain.h b/layers/swapchain.h
index 2c88525..1f739f6 100644
--- a/layers/swapchain.h
+++ b/layers/swapchain.h
@@ -84,11 +84,6 @@ const char * swapchain_layer_name = "Swapchain";
 
 #define LAYER_NAME (char *) "Swapchain"
 
-#define LOG_INFO_WRONG_NEXT(objType, type, obj)                                                                                    \
-    (my_data) ? log_msg(my_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, (objType), (uint64_t)(obj), 0,                  \
-                        SWAPCHAIN_WRONG_NEXT, LAYER_NAME, "%s() called with non-NULL value for %s->pNext.", __FUNCTION__, (obj))   \
-              : VK_FALSE
-
 // NOTE: The following struct's/typedef's are for keeping track of
 // info that is used for validating the WSI extensions.
 
-- 
2.7.4