Correct indentation in SubAllocDescriptorSetRange and do small touch ups due to changed APIs

devsh · devsh · commit 2c46f2d9bc60 · 2024-10-15T16:42:03.000+02:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 730cef5a13e6d933da54ab4c7cdad2c50bea3faa
+Subproject commit 02fc1caacf3545fb23d838a5270f87dfd7176b2e
diff --git a/include/nbl/asset/IDescriptorSet.h b/include/nbl/asset/IDescriptorSet.h
@@ -85,6 +85,13 @@ class IDescriptorSet : public virtual core::IReferenceCounted // TODO: try to re
 					info.buffer.offset = range.offset;
 					info.buffer.size = range.size;
 				}
+				template<typename ImageType>
+				SDescriptorInfo(const core::smart_refctd_ptr<IImageView<ImageType>>& image, const IImage::LAYOUT layout, const core::smart_refctd_ptr<typename layout_t::sampler_type>& sampler={}) : desc()
+				{
+					desc = image;
+					info.image.imageLayout = layout;
+					info.combinedImageSampler.sampler = sampler;
+				}
 				SDescriptorInfo(const SDescriptorInfo& other) : SDescriptorInfo()
 				{
 					operator=(other);
diff --git a/include/nbl/video/alloc/SubAllocatedDescriptorSet.h b/include/nbl/video/alloc/SubAllocatedDescriptorSet.h

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,13 @@ class IDescriptorSet : public virtual core::IReferenceCounted // TODO: try to re`
`85`	`85`	`info.buffer.offset = range.offset;`
`86`	`86`	`info.buffer.size = range.size;`
`87`	`87`	`}`
	`88`	`+ template<typename ImageType>`
	`89`	`+ SDescriptorInfo(const core::smart_refctd_ptr<IImageView<ImageType>>& image, const IImage::LAYOUT layout, const core::smart_refctd_ptr<typename layout_t::sampler_type>& sampler={}) : desc()`
	`90`	`+ {`
	`91`	`+ desc = image;`
	`92`	`+ info.image.imageLayout = layout;`
	`93`	`+ info.combinedImageSampler.sampler = sampler;`
	`94`	`+ }`
`88`	`95`	`SDescriptorInfo(const SDescriptorInfo& other) : SDescriptorInfo()`
`89`	`96`	`{`
`90`	`97`	`operator=(other);`