commit fad7adf3a9743a5663630e32c130e59a5b241209
author Tobin Ehlis <tobine@google.com> Thu Oct 20 06:50:37 2016 -0600
committer Tobin Ehlis <tobine@google.com> Tue Oct 25 21:15:48 2016 -0600
tree a28a703d3034a44dcdfc23e775e27d3c7e78a7c9
parent e030b108978abd7a80928277ce5850c46f18a28e

layers:Rename SAMPLER_NODE->SAMPLER_STATE

layers/descriptor_sets.cpp

diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp
index 500957c..6c8be9c 100644
--- a/layers/descriptor_sets.cpp
+++ b/layers/descriptor_sets.cpp
@@ -689,7 +689,7 @@
 }
 // Validate given sampler. Currently this only checks to make sure it exists in the samplerMap
 bool cvdescriptorset::ValidateSampler(const VkSampler sampler, const core_validation::layer_data *dev_data) {
-    return (getSamplerNode(dev_data, sampler) != nullptr);
+    return (getSamplerState(dev_data, sampler) != nullptr);
 }
 
 bool cvdescriptorset::ValidateImageUpdate(VkImageView image_view, VkImageLayout image_layout, VkDescriptorType type,
@@ -874,9 +874,9 @@
 
 void cvdescriptorset::SamplerDescriptor::BindCommandBuffer(const core_validation::layer_data *dev_data, GLOBAL_CB_NODE *cb_node) {
     if (!immutable_) {
-        auto sampler_node = getSamplerNode(dev_data, sampler_);
-        if (sampler_node)
-            core_validation::AddCommandBufferBindingSampler(cb_node, sampler_node);
+        auto sampler_state = getSamplerState(dev_data, sampler_);
+        if (sampler_state)
+            core_validation::AddCommandBufferBindingSampler(cb_node, sampler_state);
     }
 }
 
@@ -921,9 +921,9 @@
                                                                 GLOBAL_CB_NODE *cb_node) {
     // First add binding for any non-immutable sampler
     if (!immutable_) {
-        auto sampler_node = getSamplerNode(dev_data, sampler_);
-        if (sampler_node)
-            core_validation::AddCommandBufferBindingSampler(cb_node, sampler_node);
+        auto sampler_state = getSamplerState(dev_data, sampler_);
+        if (sampler_state)
+            core_validation::AddCommandBufferBindingSampler(cb_node, sampler_state);
     }
     // Add binding for image
     auto iv_state = getImageViewState(dev_data, image_view_);