layers: Remove spurious using BASE_NODE::*.

Inheritance is all public (except for FRAMEBUFFER_NODE, which ought to
have been), and there's no template inheritance involved, so these
didn't do anything interesting.

Fix FRAMEBUFFER_NODE to publicly inherit BASE_NODE, and drop the noise
everywhere.

Signed-off-by: Chris Forbes <chrisforbes@google.com>

diff --git a/layers/core_validation.h b/layers/core_validation.h
index 0164803..fde5cbe 100644 (file)
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -148,14 +148,12 @@ class FENCE_NODE {
 
 class SEMAPHORE_NODE : public BASE_NODE {
   public:
-    using BASE_NODE::in_use;
     std::pair<VkQueue, uint64_t> signaler;
     bool signaled;
 };
 
 class EVENT_NODE : public BASE_NODE {
   public:
-    using BASE_NODE::in_use;
     int write_in_use;
     bool needsSignaled;
     VkPipelineStageFlags stageMask;
@@ -179,8 +177,6 @@ class QUERY_POOL_NODE : public BASE_NODE {
 
 class FRAMEBUFFER_NODE : public BASE_NODE {
   public:
-    using BASE_NODE::in_use;
-    using BASE_NODE::cb_bindings;
     VkFramebuffer framebuffer;
     safe_VkFramebufferCreateInfo createInfo;
     safe_VkRenderPassCreateInfo renderPassCreateInfo;

diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index 4e1fc1c..e55a5ce 100644 (file)
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -146,7 +146,6 @@ struct DESCRIPTOR_POOL_NODE : BASE_NODE {
 
 class BUFFER_NODE : public BASE_NODE {
   public:
-    using BASE_NODE::in_use;
     VkBuffer buffer;
     VkDeviceMemory mem;
     VkDeviceSize memOffset;
@@ -178,7 +177,6 @@ struct SAMPLER_NODE : public BASE_NODE {
 
 class IMAGE_NODE : public BASE_NODE {
   public:
-    using BASE_NODE::in_use;
     VkImage image;
     VkImageCreateInfo createInfo;
     VkDeviceMemory mem;

diff --git a/layers/descriptor_sets.h b/layers/descriptor_sets.h
index aeb071d..541f02d 100644 (file)
--- a/layers/descriptor_sets.h
+++ b/layers/descriptor_sets.h
@@ -293,8 +293,6 @@ void PerformAllocateDescriptorSets(const VkDescriptorSetAllocateInfo *, const Vk
  */
 class DescriptorSet : public BASE_NODE {
   public:
-    using BASE_NODE::in_use;
-    using BASE_NODE::cb_bindings;
     DescriptorSet(const VkDescriptorSet, const DescriptorSetLayout *, const core_validation::layer_data *);
     ~DescriptorSet();
     // A number of common Get* functions that return data based on layout from which this set was created