add a layout_t to IDescriptorSet, and change the default float UTB count for VG

Author: devshgraphicsprogramming

include/nbl/asset/IDescriptorSet.h

@@ -57,6 +57,7 @@ class IDescriptorSet : public virtual core::IReferenceCounted
 		using this_type = IDescriptorSet<LayoutType>;
 
 	public:
+		using layout_t = LayoutType;
 		struct SDescriptorInfo
 		{
                 struct SBufferInfo
@@ -66,7 +67,7 @@ class IDescriptorSet : public virtual core::IReferenceCounted
                 };
                 struct SImageInfo
                 {
-                    core::smart_refctd_ptr<typename LayoutType::sampler_type> sampler;
+                    core::smart_refctd_ptr<typename layout_t::sampler_type> sampler;
                     //! Irrelevant in OpenGL backend
                     E_IMAGE_LAYOUT imageLayout;
                 };
@@ -131,15 +132,15 @@ class IDescriptorSet : public virtual core::IReferenceCounted
 			uint32_t count;
 		};
 
-		const LayoutType* getLayout() const { return m_layout.get(); }
+		const layout_t* getLayout() const { return m_layout.get(); }
 
 	protected:
-		IDescriptorSet(core::smart_refctd_ptr<LayoutType>&& _layout) : m_layout(std::move(_layout))
+		IDescriptorSet(core::smart_refctd_ptr<layout_t>&& _layout) : m_layout(std::move(_layout))
 		{
 		}
 		virtual ~IDescriptorSet() = default;
 
-		core::smart_refctd_ptr<LayoutType> m_layout;
+		core::smart_refctd_ptr<layout_t> m_layout;
 };
 
 

include/nbl/builtin/glsl/virtual_geometry/descriptors.glsl

@@ -20,7 +20,7 @@
 #endif
 #ifndef _NBL_VG_FLOAT_BUFFERS
 #define _NBL_VG_FLOAT_BUFFERS_BINDING 1 
-#define _NBL_VG_FLOAT_BUFFERS_COUNT 15
+#define _NBL_VG_FLOAT_BUFFERS_COUNT 4
 #endif
 #ifndef _NBL_VG_INT_BUFFERS
 #define _NBL_VG_INT_BUFFERS_BINDING 2