Added ShaderSet::geometryHints mask to help prompt scene graph builders to generate particular types of geometry/meshshaders

Author: robertosfield

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(vsg
-    VERSION 1.1.15
+    VERSION 1.1.16
     DESCRIPTION "VulkanSceneGraph library"
     LANGUAGES CXX
 )

include/vsg/utils/ShaderSet.h

@@ -128,6 +128,19 @@ namespace vsg
         GraphicsPipelineStates defaultGraphicsPipelineStates;
         std::vector<ref_ptr<CustomDescriptorSetBinding>> customDescriptorSetBindings;
 
+        /// Hints mask for scene graph builders for what ShaderSet prefers/requires.
+        enum GeometryHints : uint32_t
+        {
+            NO_PREFERENCE = 0,
+            GEOMETRY = 1 << 0,
+            VERTEXDRAW = 1 << 1,
+            VERTEXINDEXDRAW = 1 << 2,
+            DRAWMESHTASKS = 1 << 3,
+            MESHLETS = 1 << 4
+        };
+
+        uint32_t geometryHints = GeometryHints::NO_PREFERENCE;
+
         ref_ptr<ShaderCompileSettings> defaultShaderHints;
         /// variants of the rootShaderModule compiled for different combinations of ShaderCompileSettings
         std::map<ref_ptr<ShaderCompileSettings>, ShaderStages, DereferenceLess> variants;

src/vsg/utils/ShaderSet.cpp

@@ -294,7 +294,8 @@ int ShaderSet::compare(const Object& rhs_object) const
     if ((result = compare_container(pushConstantRanges, rhs.pushConstantRanges))) return result;
     if ((result = compare_container(definesArrayStates, rhs.definesArrayStates))) return result;
     if ((result = compare_container(optionalDefines, rhs.optionalDefines))) return result;
-    return compare_pointer_container(defaultGraphicsPipelineStates, rhs.defaultGraphicsPipelineStates);
+    if ((result = compare_pointer_container(defaultGraphicsPipelineStates, rhs.defaultGraphicsPipelineStates))) return result;
+    return compare_value(geometryHints, rhs.geometryHints);
 }
 
 void ShaderSet::read(Input& input)
@@ -377,6 +378,11 @@ void ShaderSet::read(Input& input)
             }
         }
     }
+
+    if (input.version_greater_equal(1, 1, 16))
+    {
+        input.readValue<uint32_t>("geometryHints", geometryHints);
+    }
 }
 
 void ShaderSet::write(Output& output) const
@@ -450,6 +456,11 @@ void ShaderSet::write(Output& output) const
             output.writeObject("customDescriptorSetBinding", custom);
         }
     }
+
+    if (output.version_greater_equal(1, 1, 16))
+    {
+        output.writeValue<uint32_t>("geometryHints", geometryHints);
+    }
 }
 
 ref_ptr<ShaderSet> vsg::createFlatShadedShaderSet(ref_ptr<const Options> options)