Merge pull request #963 from vsg-dev/DescriptorBinding

robertosfield · web-flow · commit fa9f06689ddd · 2023-09-07T15:51:14.000+01:00
Renamed vsg::UniformBinding to vsg::DescriptorBinding and renamed/decprecated enable/assignUnfirom() methods to enable/assignDescriptor().
diff --git a/include/vsg/state/StateCommand.h b/include/vsg/state/StateCommand.h
@@ -17,7 +17,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
 
-    /// Base class for Vulkan commands associated with state, such as binding graphics pipelines and descriptor sets (textures and uniforms).
+    /// Base class for Vulkan commands associated with state, such as binding graphics
+    /// pipelines and descriptor sets for textures, uniform buffers and storage buffers.
     /// StateCommands can be attached directly as nodes in the scene graph, or more typically assigned to StateGroup nodes to enable push/popping of state.
     class VSG_DECLSPEC StateCommand : public Inherit<Command, StateCommand>
     {
diff --git a/include/vsg/utils/GraphicsPipelineConfigurator.h b/include/vsg/utils/GraphicsPipelineConfigurator.h
@@ -45,13 +45,22 @@ namespace vsg
         bool two_sided = false;
 
         bool enableTexture(const std::string& name);
-        bool enableUniform(const std::string& name);
-
         bool assignTexture(const std::string& name, ref_ptr<Data> textureData = {}, ref_ptr<Sampler> sampler = {}, uint32_t dstArrayElement = 0);
         bool assignTexture(const std::string& name, const ImageInfoList& imageInfoList, uint32_t dstArrayElement = 0);
 
-        bool assignUniform(const std::string& name, ref_ptr<Data> data = {}, uint32_t dstArrayElement = 0);
-        bool assignUniform(const std::string& name, const BufferInfoList& bufferInfoList, uint32_t dstArrayElement = 0);
+        bool enableDescriptor(const std::string& name);
+        bool assignDescriptor(const std::string& name, ref_ptr<Data> data = {}, uint32_t dstArrayElement = 0);
+        bool assignDescriptor(const std::string& name, const BufferInfoList& bufferInfoList, uint32_t dstArrayElement = 0);
+
+        [[deprecated("use enableDescriptor(..)")]]
+        bool enableUniform(const std::string& name) { return enableDescriptor(name); }
+
+        [[deprecated("use assignDescriptor(..)")]]
+        bool assignUniform(const std::string& name, ref_ptr<Data> data = {}, uint32_t dstArrayElement = 0) { return assignDescriptor(name, data, dstArrayElement); }
+
+        [[deprecated("use assignDescriptor(..)")]]
+        bool assignUniform(const std::string& name, const BufferInfoList& bufferInfoList, uint32_t dstArrayElement = 0) { return assignDescriptor(name, bufferInfoList, dstArrayElement); }
+
 
         bool assignDescriptor(uint32_t set, uint32_t binding, VkDescriptorType descriptorType, uint32_t descriptorCount, VkShaderStageFlags stageFlags, ref_ptr<Descriptor> descriptor);
 
@@ -104,12 +113,18 @@ namespace vsg
         void reset();
 
         bool enableArray(const std::string& name, VkVertexInputRate vertexInputRate, uint32_t stride, VkFormat format = VK_FORMAT_UNDEFINED);
+        bool enableDescriptor(const std::string& name);
         bool enableTexture(const std::string& name);
-        bool enableUniform(const std::string& name);
 
         bool assignArray(DataList& arrays, const std::string& name, VkVertexInputRate vertexInputRate, ref_ptr<Data> array);
+        bool assignDescriptor(const std::string& name, ref_ptr<Data> data = {});
         bool assignTexture(const std::string& name, ref_ptr<Data> textureData = {}, ref_ptr<Sampler> sampler = {});
-        bool assignUniform(const std::string& name, ref_ptr<Data> data = {});
+
+        [[deprecated("use enableDescriptor(..)")]]
+        bool enableUniform(const std::string& name) { return enableDescriptor(name); }
+
+        [[deprecated("use assignDescriptor(..)")]]
+        bool assignUniform(const std::string& name, ref_ptr<Data> data = {}) { return assignDescriptor(name, data); }
 
         // setup by assign calls
         ref_ptr<ShaderCompileSettings> shaderHints;
diff --git a/include/vsg/utils/ShaderSet.h b/include/vsg/utils/ShaderSet.h
@@ -35,7 +35,7 @@ namespace vsg
     };
     VSG_type_name(vsg::AttributeBinding);
 
-    struct VSG_DECLSPEC UniformBinding
+    struct VSG_DECLSPEC DescriptorBinding
     {
         std::string name;
         std::string define;
@@ -46,11 +46,11 @@ namespace vsg
         VkShaderStageFlags stageFlags = 0;
         ref_ptr<Data> data;
 
-        int compare(const UniformBinding& rhs) const;
+        int compare(const DescriptorBinding& rhs) const;
 
         explicit operator bool() const noexcept { return !name.empty(); }
     };
-    VSG_type_name(vsg::UniformBinding);
+    VSG_type_name(vsg::DescriptorBinding);
 
     struct VSG_DECLSPEC PushConstantRange
     {
@@ -116,7 +116,7 @@ namespace vsg
         ShaderStages stages;
 
         std::vector<AttributeBinding> attributeBindings;
-        std::vector<UniformBinding> uniformBindings;
+        std::vector<DescriptorBinding> descriptorBindings;
         std::vector<PushConstantRange> pushConstantRanges;
         std::vector<DefinesArrayState> definesArrayStates; // put more constrained ArrayState matches first so they are matched first.
         std::set<std::string> optionalDefines;
@@ -134,30 +134,40 @@ namespace vsg
         void addAttributeBinding(std::string name, std::string define, uint32_t location, VkFormat format, ref_ptr<Data> data);
 
         /// add an uniform binding. Not thread safe, should only be called when initially setting up the ShaderSet
-        void addUniformBinding(std::string name, std::string define, uint32_t set, uint32_t binding, VkDescriptorType descriptorType, uint32_t descriptorCount, VkShaderStageFlags stageFlags, ref_ptr<Data> data);
+        void addDescriptorBinding(std::string name, std::string define, uint32_t set, uint32_t binding, VkDescriptorType descriptorType, uint32_t descriptorCount, VkShaderStageFlags stageFlags, ref_ptr<Data> data);
+
+        [[deprecated("use addDescriptorBinding(..)")]]
+        void addUniformBinding(std::string name, std::string define, uint32_t set, uint32_t binding, VkDescriptorType descriptorType, uint32_t descriptorCount, VkShaderStageFlags stageFlags, ref_ptr<Data> data) { addDescriptorBinding(name, define, set, binding, descriptorType, descriptorCount, stageFlags, data); }
+
 
         /// add a push constant range. Not thread safe, should only be called when initially setting up the ShaderSet
         void addPushConstantRange(std::string name, std::string define, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size);
 
         /// get the AttributeBinding associated with name
         AttributeBinding& getAttributeBinding(const std::string& name);
 
-        /// get the UniformBinding associated with name
-        UniformBinding& getUniformBinding(const std::string& name);
-
         /// get the const AttributeBinding associated with name
         const AttributeBinding& getAttributeBinding(const std::string& name) const;
 
-        /// get the const UniformBinding associated with name
-        const UniformBinding& getUniformBinding(const std::string& name) const;
+        /// get the DescriptorBinding associated with name
+        DescriptorBinding& getDescriptorBinding(const std::string& name);
+
+        /// get the const DescriptorBinding associated with name
+        const DescriptorBinding& getDescriptorBinding(const std::string& name) const;
+
+        [[deprecated("use getDescriptorBinding(..)")]]
+        DescriptorBinding& getUniformBinding(const std::string& name) { return getDescriptorBinding(name); }
+
+        [[deprecated("use getDescriptorBinding(..)")]]
+        const DescriptorBinding& getUnifomrBinding(const std::string& name) const { return getDescriptorBinding(name); }
 
         /// get the first ArrayState that has matches with defines in the specified list of defines.
         ref_ptr<ArrayState> getSuitableArrayState(const std::set<std::string>& defines) const;
 
         /// get the ShaderStages variant that uses specified ShaderCompileSettings.
         ShaderStages getShaderStages(ref_ptr<ShaderCompileSettings> scs = {});
 
-        /// return the <minimum_set, maximum_set+1> range of set numbers encompassing UniformBindings
+        /// return the <minimum_set, maximum_set+1> range of set numbers encompassing DescriptorBindings
         std::pair<uint32_t, uint32_t> descriptorSetRange() const;
 
         /// create the descriptor set layout.
@@ -182,7 +192,7 @@ namespace vsg
         virtual ~ShaderSet();
 
         AttributeBinding _nullAttributeBinding;
-        UniformBinding _nullUniformBinding;
+        DescriptorBinding _nullDescriptorBinding;
     };
     VSG_type_name(vsg::ShaderSet);
 
diff --git a/src/vsg/io/tile.cpp b/src/vsg/io/tile.cpp
@@ -327,14 +327,14 @@ void tile::init(vsg::ref_ptr<const vsg::Options> options)
         _graphicsPipelineConfig->enableTexture("displacementMap");
     }
 #endif
-    _graphicsPipelineConfig->enableUniform("material");
+    _graphicsPipelineConfig->enableDescriptor("material");
 
     _graphicsPipelineConfig->enableArray("vsg_Vertex", VK_VERTEX_INPUT_RATE_VERTEX, 12, VK_FORMAT_R32G32B32_SFLOAT);
     _graphicsPipelineConfig->enableArray("vsg_Normal", VK_VERTEX_INPUT_RATE_VERTEX, 12, VK_FORMAT_R32G32B32_SFLOAT);
     _graphicsPipelineConfig->enableArray("vsg_TexCoord0", VK_VERTEX_INPUT_RATE_VERTEX, 8, VK_FORMAT_R32G32_SFLOAT);
     _graphicsPipelineConfig->enableArray("vsg_Color", VK_VERTEX_INPUT_RATE_INSTANCE, 16, VK_FORMAT_R32G32B32A32_SFLOAT);
 
-    if (auto& materialBinding = _shaderSet->getUniformBinding("material"))
+    if (auto& materialBinding = _shaderSet->getDescriptorBinding("material"))
     {
         ref_ptr<Data> mat = materialBinding.data;
         if (!mat) mat = vsg::PhongMaterialValue::create();
diff --git a/src/vsg/text/GpuLayoutTechnique.cpp b/src/vsg/text/GpuLayoutTechnique.cpp
@@ -249,8 +249,8 @@ void GpuLayoutTechnique::setup(Text* text, uint32_t minimumAllocation, ref_ptr<c
         config->assignTexture("textureAtlas", text->font->atlas, sampler);
         config->assignTexture("glyphMetrics", glyphMetricsProxy, glyphMetricSampler);
 
-        config->assignUniform("textLayout", layoutValue);
-        config->assignUniform("text", textArray);
+        config->assignDescriptor("textLayout", layoutValue);
+        config->assignDescriptor("text", textArray);
 
         // Set the InputAssemblyState.topology
         struct SetPipelineStates : public Visitor
diff --git a/src/vsg/utils/Builder.cpp b/src/vsg/utils/Builder.cpp
@@ -81,11 +81,11 @@ ref_ptr<StateGroup> Builder::createStateGroup(const StateInfo& stateInfo)
         graphicsPipelineConfig->assignTexture("displacementMap", stateInfo.displacementMap, sampler);
     }
 
-    if (auto& materialBinding = activeShaderSet->getUniformBinding("material"))
+    if (auto& materialBinding = activeShaderSet->getDescriptorBinding("material"))
     {
         ref_ptr<Data> mat = materialBinding.data;
         if (!mat) mat = vsg::PhongMaterialValue::create();
-        graphicsPipelineConfig->assignUniform("material", mat);
+        graphicsPipelineConfig->assignDescriptor("material", mat);
     }
 
     graphicsPipelineConfig->enableArray("vsg_Vertex", VK_VERTEX_INPUT_RATE_VERTEX, 12);
diff --git a/src/vsg/utils/GraphicsPipelineConfigurator.cpp b/src/vsg/utils/GraphicsPipelineConfigurator.cpp
@@ -101,7 +101,7 @@ void DescriptorConfigurator::reset()
 
 bool DescriptorConfigurator::enableTexture(const std::string& name)
 {
-    if (auto& textureBinding = shaderSet->getUniformBinding(name))
+    if (auto& textureBinding = shaderSet->getDescriptorBinding(name))
     {
         assigned.insert(name);
 
@@ -118,7 +118,7 @@ bool DescriptorConfigurator::enableTexture(const std::string& name)
 
 bool DescriptorConfigurator::assignTexture(const std::string& name, ref_ptr<Data> textureData, ref_ptr<Sampler> sampler, uint32_t dstArrayElement)
 {
-    if (auto& textureBinding = shaderSet->getUniformBinding(name))
+    if (auto& textureBinding = shaderSet->getDescriptorBinding(name))
     {
         assigned.insert(name);
 
@@ -135,7 +135,7 @@ bool DescriptorConfigurator::assignTexture(const std::string& name, ref_ptr<Data
 
 bool DescriptorConfigurator::assignTexture(const std::string& name, const ImageInfoList& imageInfoList, uint32_t dstArrayElement)
 {
-    if (auto& textureBinding = shaderSet->getUniformBinding(name))
+    if (auto& textureBinding = shaderSet->getDescriptorBinding(name))
     {
         assigned.insert(name);
 
@@ -149,50 +149,50 @@ bool DescriptorConfigurator::assignTexture(const std::string& name, const ImageI
     return false;
 }
 
-bool DescriptorConfigurator::enableUniform(const std::string& name)
+bool DescriptorConfigurator::enableDescriptor(const std::string& name)
 {
-    if (auto& uniformBinding = shaderSet->getUniformBinding(name))
+    if (auto& descriptorBinding = shaderSet->getDescriptorBinding(name))
     {
         assigned.insert(name);
 
         // set up bindings
-        if (!uniformBinding.define.empty()) defines.insert(uniformBinding.define);
+        if (!descriptorBinding.define.empty()) defines.insert(descriptorBinding.define);
 
         // create uniform and associated DescriptorSets and binding
-        return assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,
-                                DescriptorBuffer::create(uniformBinding.data, uniformBinding.binding));
+        return assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,
+                                DescriptorBuffer::create(descriptorBinding.data, descriptorBinding.binding));
     }
     return false;
 }
 
-bool DescriptorConfigurator::assignUniform(const std::string& name, ref_ptr<Data> data, uint32_t dstArrayElement)
+bool DescriptorConfigurator::assignDescriptor(const std::string& name, ref_ptr<Data> data, uint32_t dstArrayElement)
 {
-    if (auto& uniformBinding = shaderSet->getUniformBinding(name))
+    if (auto& descriptorBinding = shaderSet->getDescriptorBinding(name))
     {
         assigned.insert(name);
 
         // set up bindings
-        if (!uniformBinding.define.empty()) defines.insert(uniformBinding.define);
+        if (!descriptorBinding.define.empty()) defines.insert(descriptorBinding.define);
 
         // create uniform and associated DescriptorSets and binding
-        return assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,
-                                DescriptorBuffer::create(data ? data : uniformBinding.data, uniformBinding.binding, dstArrayElement, uniformBinding.descriptorType));
+        return assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,
+                                DescriptorBuffer::create(data ? data : descriptorBinding.data, descriptorBinding.binding, dstArrayElement, descriptorBinding.descriptorType));
     }
     return false;
 }
 
-bool DescriptorConfigurator::assignUniform(const std::string& name, const BufferInfoList& bufferInfoList, uint32_t dstArrayElement)
+bool DescriptorConfigurator::assignDescriptor(const std::string& name, const BufferInfoList& bufferInfoList, uint32_t dstArrayElement)
 {
-    if (auto& uniformBinding = shaderSet->getUniformBinding(name))
+    if (auto& descriptorBinding = shaderSet->getDescriptorBinding(name))
     {
         assigned.insert(name);
 
         // set up bindings
-        if (!uniformBinding.define.empty()) defines.insert(uniformBinding.define);
+        if (!descriptorBinding.define.empty()) defines.insert(descriptorBinding.define);
 
         // create uniform and associated DescriptorSets and binding
-        return assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,
-                                DescriptorBuffer::create(bufferInfoList, uniformBinding.binding, dstArrayElement, uniformBinding.descriptorType));
+        return assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,
+                                DescriptorBuffer::create(bufferInfoList, descriptorBinding.binding, dstArrayElement, descriptorBinding.descriptorType));
     }
     return false;
 }
@@ -223,14 +223,14 @@ bool DescriptorConfigurator::assignDefaults()
     bool assignedDefault = false;
     if (shaderSet)
     {
-        for (auto& uniformBinding : shaderSet->uniformBindings)
+        for (auto& descriptorBinding : shaderSet->descriptorBindings)
         {
-            if (uniformBinding.define.empty() && assigned.count(uniformBinding.name) == 0)
+            if (descriptorBinding.define.empty() && assigned.count(descriptorBinding.name) == 0)
             {
                 bool set_matched = false;
                 for (auto& cds : shaderSet->customDescriptorSetBindings)
                 {
-                    if (cds->set == uniformBinding.set)
+                    if (cds->set == descriptorBinding.set)
                     {
                         set_matched = true;
                         break;
@@ -239,7 +239,7 @@ bool DescriptorConfigurator::assignDefaults()
                 if (!set_matched)
                 {
                     bool isTexture = false;
-                    switch (uniformBinding.descriptorType)
+                    switch (descriptorBinding.descriptorType)
                     {
                     case (VK_DESCRIPTOR_TYPE_SAMPLER):
                     case (VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER):
@@ -253,16 +253,16 @@ bool DescriptorConfigurator::assignDefaults()
 
                     if (isTexture)
                     {
-                        assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,
-                                         DescriptorImage::create(Sampler::create(), uniformBinding.data, uniformBinding.binding, 0, uniformBinding.descriptorType));
+                        assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,
+                                         DescriptorImage::create(Sampler::create(), descriptorBinding.data, descriptorBinding.binding, 0, descriptorBinding.descriptorType));
                     }
                     else
                     {
-                        assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,
-                                         DescriptorBuffer::create(uniformBinding.data, uniformBinding.binding));
+                        assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,
+                                         DescriptorBuffer::create(descriptorBinding.data, descriptorBinding.binding));
                     }
 
-                    assigned.insert(uniformBinding.name);
+                    assigned.insert(descriptorBinding.name);
                     assignedDefault = true;
                 }
             }
@@ -401,10 +401,10 @@ bool GraphicsPipelineConfigurator::enableTexture(const std::string& name)
     return descriptorConfigurator->enableTexture(name);
 }
 
-bool GraphicsPipelineConfigurator::enableUniform(const std::string& name)
+bool GraphicsPipelineConfigurator::enableDescriptor(const std::string& name)
 {
     if (!descriptorConfigurator) descriptorConfigurator = DescriptorConfigurator::create(shaderSet);
-    return descriptorConfigurator->enableUniform(name);
+    return descriptorConfigurator->enableDescriptor(name);
 }
 
 bool GraphicsPipelineConfigurator::assignArray(DataList& arrays, const std::string& name, VkVertexInputRate vertexInputRate, ref_ptr<Data> array)
@@ -429,10 +429,10 @@ bool GraphicsPipelineConfigurator::assignTexture(const std::string& name, ref_pt
     return descriptorConfigurator->assignTexture(name, textureData, sampler);
 }
 
-bool GraphicsPipelineConfigurator::assignUniform(const std::string& name, ref_ptr<Data> data)
+bool GraphicsPipelineConfigurator::assignDescriptor(const std::string& name, ref_ptr<Data> data)
 {
     if (!descriptorConfigurator) descriptorConfigurator = DescriptorConfigurator::create(shaderSet);
-    return descriptorConfigurator->assignUniform(name, data);
+    return descriptorConfigurator->assignDescriptor(name, data);
 }
 
 int GraphicsPipelineConfigurator::compare(const Object& rhs_object) const
diff --git a/src/vsg/utils/ShaderSet.cpp b/src/vsg/utils/ShaderSet.cpp

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI`
`17`	`17`	`namespace vsg`
`18`	`18`	`{`
`19`	`19`
`20`		`- /// Base class for Vulkan commands associated with state, such as binding graphics pipelines and descriptor sets (textures and uniforms).`
	`20`	`+ /// Base class for Vulkan commands associated with state, such as binding graphics`
	`21`	`+ /// pipelines and descriptor sets for textures, uniform buffers and storage buffers.`
`21`	`22`	`/// StateCommands can be attached directly as nodes in the scene graph, or more typically assigned to StateGroup nodes to enable push/popping of state.`
`22`	`23`	`class VSG_DECLSPEC StateCommand : public Inherit<Command, StateCommand>`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,11 @@ ref_ptr<StateGroup> Builder::createStateGroup(const StateInfo& stateInfo)`
`81`	`81`	`graphicsPipelineConfig->assignTexture("displacementMap", stateInfo.displacementMap, sampler);`
`82`	`82`	`}`
`83`	`83`
`84`		`- if (auto& materialBinding = activeShaderSet->getUniformBinding("material"))`
	`84`	`+ if (auto& materialBinding = activeShaderSet->getDescriptorBinding("material"))`
`85`	`85`	`{`
`86`	`86`	`ref_ptr<Data> mat = materialBinding.data;`
`87`	`87`	`if (!mat) mat = vsg::PhongMaterialValue::create();`
`88`		`- graphicsPipelineConfig->assignUniform("material", mat);`
	`88`	`+ graphicsPipelineConfig->assignDescriptor("material", mat);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`graphicsPipelineConfig->enableArray("vsg_Vertex", VK_VERTEX_INPUT_RATE_VERTEX, 12);`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ void DescriptorConfigurator::reset()`
`101`	`101`
`102`	`102`	`bool DescriptorConfigurator::enableTexture(const std::string& name)`
`103`	`103`	`{`
`104`		`- if (auto& textureBinding = shaderSet->getUniformBinding(name))`
	`104`	`+ if (auto& textureBinding = shaderSet->getDescriptorBinding(name))`
`105`	`105`	`{`
`106`	`106`	`assigned.insert(name);`
`107`	`107`
`@@ -118,7 +118,7 @@ bool DescriptorConfigurator::enableTexture(const std::string& name)`
`118`	`118`
`119`	`119`	`bool DescriptorConfigurator::assignTexture(const std::string& name, ref_ptr<Data> textureData, ref_ptr<Sampler> sampler, uint32_t dstArrayElement)`
`120`	`120`	`{`
`121`		`- if (auto& textureBinding = shaderSet->getUniformBinding(name))`
	`121`	`+ if (auto& textureBinding = shaderSet->getDescriptorBinding(name))`
`122`	`122`	`{`
`123`	`123`	`assigned.insert(name);`
`124`	`124`
`@@ -135,7 +135,7 @@ bool DescriptorConfigurator::assignTexture(const std::string& name, ref_ptr<Data`
`135`	`135`
`136`	`136`	`bool DescriptorConfigurator::assignTexture(const std::string& name, const ImageInfoList& imageInfoList, uint32_t dstArrayElement)`
`137`	`137`	`{`
`138`		`- if (auto& textureBinding = shaderSet->getUniformBinding(name))`
	`138`	`+ if (auto& textureBinding = shaderSet->getDescriptorBinding(name))`
`139`	`139`	`{`
`140`	`140`	`assigned.insert(name);`
`141`	`141`
`@@ -149,50 +149,50 @@ bool DescriptorConfigurator::assignTexture(const std::string& name, const ImageI`
`149`	`149`	`return false;`
`150`	`150`	`}`
`151`	`151`
`152`		`-bool DescriptorConfigurator::enableUniform(const std::string& name)`
	`152`	`+bool DescriptorConfigurator::enableDescriptor(const std::string& name)`
`153`	`153`	`{`
`154`		`- if (auto& uniformBinding = shaderSet->getUniformBinding(name))`
	`154`	`+ if (auto& descriptorBinding = shaderSet->getDescriptorBinding(name))`
`155`	`155`	`{`
`156`	`156`	`assigned.insert(name);`
`157`	`157`
`158`	`158`	`// set up bindings`
`159`		`- if (!uniformBinding.define.empty()) defines.insert(uniformBinding.define);`
	`159`	`+ if (!descriptorBinding.define.empty()) defines.insert(descriptorBinding.define);`
`160`	`160`
`161`	`161`	`// create uniform and associated DescriptorSets and binding`
`162`		`- return assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,`
`163`		`- DescriptorBuffer::create(uniformBinding.data, uniformBinding.binding));`
	`162`	`+ return assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,`
	`163`	`+ DescriptorBuffer::create(descriptorBinding.data, descriptorBinding.binding));`
`164`	`164`	`}`
`165`	`165`	`return false;`
`166`	`166`	`}`
`167`	`167`
`168`		`-bool DescriptorConfigurator::assignUniform(const std::string& name, ref_ptr<Data> data, uint32_t dstArrayElement)`
	`168`	`+bool DescriptorConfigurator::assignDescriptor(const std::string& name, ref_ptr<Data> data, uint32_t dstArrayElement)`
`169`	`169`	`{`
`170`		`- if (auto& uniformBinding = shaderSet->getUniformBinding(name))`
	`170`	`+ if (auto& descriptorBinding = shaderSet->getDescriptorBinding(name))`
`171`	`171`	`{`
`172`	`172`	`assigned.insert(name);`
`173`	`173`
`174`	`174`	`// set up bindings`
`175`		`- if (!uniformBinding.define.empty()) defines.insert(uniformBinding.define);`
	`175`	`+ if (!descriptorBinding.define.empty()) defines.insert(descriptorBinding.define);`
`176`	`176`
`177`	`177`	`// create uniform and associated DescriptorSets and binding`
`178`		`- return assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,`
`179`		`- DescriptorBuffer::create(data ? data : uniformBinding.data, uniformBinding.binding, dstArrayElement, uniformBinding.descriptorType));`
	`178`	`+ return assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,`
	`179`	`+ DescriptorBuffer::create(data ? data : descriptorBinding.data, descriptorBinding.binding, dstArrayElement, descriptorBinding.descriptorType));`
`180`	`180`	`}`
`181`	`181`	`return false;`
`182`	`182`	`}`
`183`	`183`
`184`		`-bool DescriptorConfigurator::assignUniform(const std::string& name, const BufferInfoList& bufferInfoList, uint32_t dstArrayElement)`
	`184`	`+bool DescriptorConfigurator::assignDescriptor(const std::string& name, const BufferInfoList& bufferInfoList, uint32_t dstArrayElement)`
`185`	`185`	`{`
`186`		`- if (auto& uniformBinding = shaderSet->getUniformBinding(name))`
	`186`	`+ if (auto& descriptorBinding = shaderSet->getDescriptorBinding(name))`
`187`	`187`	`{`
`188`	`188`	`assigned.insert(name);`
`189`	`189`
`190`	`190`	`// set up bindings`
`191`		`- if (!uniformBinding.define.empty()) defines.insert(uniformBinding.define);`
	`191`	`+ if (!descriptorBinding.define.empty()) defines.insert(descriptorBinding.define);`
`192`	`192`
`193`	`193`	`// create uniform and associated DescriptorSets and binding`
`194`		`- return assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,`
`195`		`- DescriptorBuffer::create(bufferInfoList, uniformBinding.binding, dstArrayElement, uniformBinding.descriptorType));`
	`194`	`+ return assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,`
	`195`	`+ DescriptorBuffer::create(bufferInfoList, descriptorBinding.binding, dstArrayElement, descriptorBinding.descriptorType));`
`196`	`196`	`}`
`197`	`197`	`return false;`
`198`	`198`	`}`
`@@ -223,14 +223,14 @@ bool DescriptorConfigurator::assignDefaults()`
`223`	`223`	`bool assignedDefault = false;`
`224`	`224`	`if (shaderSet)`
`225`	`225`	`{`
`226`		`- for (auto& uniformBinding : shaderSet->uniformBindings)`
	`226`	`+ for (auto& descriptorBinding : shaderSet->descriptorBindings)`
`227`	`227`	`{`
`228`		`- if (uniformBinding.define.empty() && assigned.count(uniformBinding.name) == 0)`
	`228`	`+ if (descriptorBinding.define.empty() && assigned.count(descriptorBinding.name) == 0)`
`229`	`229`	`{`
`230`	`230`	`bool set_matched = false;`
`231`	`231`	`for (auto& cds : shaderSet->customDescriptorSetBindings)`
`232`	`232`	`{`
`233`		`- if (cds->set == uniformBinding.set)`
	`233`	`+ if (cds->set == descriptorBinding.set)`
`234`	`234`	`{`
`235`	`235`	`set_matched = true;`
`236`	`236`	`break;`
`@@ -239,7 +239,7 @@ bool DescriptorConfigurator::assignDefaults()`
`239`	`239`	`if (!set_matched)`
`240`	`240`	`{`
`241`	`241`	`bool isTexture = false;`
`242`		`- switch (uniformBinding.descriptorType)`
	`242`	`+ switch (descriptorBinding.descriptorType)`
`243`	`243`	`{`
`244`	`244`	`case (VK_DESCRIPTOR_TYPE_SAMPLER):`
`245`	`245`	`case (VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER):`
`@@ -253,16 +253,16 @@ bool DescriptorConfigurator::assignDefaults()`
`253`	`253`
`254`	`254`	`if (isTexture)`
`255`	`255`	`{`
`256`		`- assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,`
`257`		`- DescriptorImage::create(Sampler::create(), uniformBinding.data, uniformBinding.binding, 0, uniformBinding.descriptorType));`
	`256`	`+ assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,`
	`257`	`+ DescriptorImage::create(Sampler::create(), descriptorBinding.data, descriptorBinding.binding, 0, descriptorBinding.descriptorType));`
`258`	`258`	`}`
`259`	`259`	`else`
`260`	`260`	`{`
`261`		`- assignDescriptor(uniformBinding.set, uniformBinding.binding, uniformBinding.descriptorType, uniformBinding.descriptorCount, uniformBinding.stageFlags,`
`262`		`- DescriptorBuffer::create(uniformBinding.data, uniformBinding.binding));`
	`261`	`+ assignDescriptor(descriptorBinding.set, descriptorBinding.binding, descriptorBinding.descriptorType, descriptorBinding.descriptorCount, descriptorBinding.stageFlags,`
	`262`	`+ DescriptorBuffer::create(descriptorBinding.data, descriptorBinding.binding));`
`263`	`263`	`}`
`264`	`264`
`265`		`- assigned.insert(uniformBinding.name);`
	`265`	`+ assigned.insert(descriptorBinding.name);`
`266`	`266`	`assignedDefault = true;`
`267`	`267`	`}`
`268`	`268`	`}`
`@@ -401,10 +401,10 @@ bool GraphicsPipelineConfigurator::enableTexture(const std::string& name)`
`401`	`401`	`return descriptorConfigurator->enableTexture(name);`
`402`	`402`	`}`
`403`	`403`
`404`		`-bool GraphicsPipelineConfigurator::enableUniform(const std::string& name)`
	`404`	`+bool GraphicsPipelineConfigurator::enableDescriptor(const std::string& name)`
`405`	`405`	`{`
`406`	`406`	`if (!descriptorConfigurator) descriptorConfigurator = DescriptorConfigurator::create(shaderSet);`
`407`		`- return descriptorConfigurator->enableUniform(name);`
	`407`	`+ return descriptorConfigurator->enableDescriptor(name);`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`bool GraphicsPipelineConfigurator::assignArray(DataList& arrays, const std::string& name, VkVertexInputRate vertexInputRate, ref_ptr<Data> array)`
`@@ -429,10 +429,10 @@ bool GraphicsPipelineConfigurator::assignTexture(const std::string& name, ref_pt`
`429`	`429`	`return descriptorConfigurator->assignTexture(name, textureData, sampler);`
`430`	`430`	`}`
`431`	`431`
`432`		`-bool GraphicsPipelineConfigurator::assignUniform(const std::string& name, ref_ptr<Data> data)`
	`432`	`+bool GraphicsPipelineConfigurator::assignDescriptor(const std::string& name, ref_ptr<Data> data)`
`433`	`433`	`{`
`434`	`434`	`if (!descriptorConfigurator) descriptorConfigurator = DescriptorConfigurator::create(shaderSet);`
`435`		`- return descriptorConfigurator->assignUniform(name, data);`
	`435`	`+ return descriptorConfigurator->assignDescriptor(name, data);`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`int GraphicsPipelineConfigurator::compare(const Object& rhs_object) const`