From 2f7e6c5bf2a7409cf4f29be1f4df8dade12e0a0b Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Thu, 24 Mar 2016 10:16:09 -0600 Subject: layers: Replace ptr-to-ptr descriptor data struct with vector We were using GENERIC_HEADER** ppDescriptors to track updates to slots. This was pretty messy so make it a bit cleaner with a vector instead. --- layers/core_validation.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'layers/core_validation.h') diff --git a/layers/core_validation.h b/layers/core_validation.h index c4a516d4..a157b43b 100644 --- a/layers/core_validation.h +++ b/layers/core_validation.h @@ -41,10 +41,6 @@ using std::vector; -//#ifdef __cplusplus -//extern "C" { -//#endif - #if MTMERGE // Mem Tracker ERROR codes typedef enum _MEM_TRACK_ERROR { @@ -618,11 +614,11 @@ class SET_NODE : public BASE_NODE { GENERIC_HEADER *pUpdateStructs; // Total num of descriptors in this set (count of its layout plus all prior layouts) uint32_t descriptorCount; - GENERIC_HEADER **ppDescriptors; // Array where each index points to update node for its slot + vector pDescriptorUpdates; // Vector where each index points to update node for its slot LAYOUT_NODE *pLayout; // Layout for this set SET_NODE *pNext; unordered_set boundCmdBuffers; // Cmd buffers that this set has been bound to - SET_NODE() : pUpdateStructs(NULL), ppDescriptors(NULL), pLayout(NULL), pNext(NULL){}; + SET_NODE() : set(VK_NULL_HANDLE), pool(VK_NULL_HANDLE), pUpdateStructs(nullptr), pLayout(nullptr), pNext(nullptr){}; }; typedef struct _DESCRIPTOR_POOL_NODE { @@ -896,7 +892,3 @@ class SWAPCHAIN_NODE { } ~SWAPCHAIN_NODE() { delete[] pQueueFamilyIndices; } }; - -//#ifdef __cplusplus -//} -//#endif -- cgit v1.2.3