post merge examples_tests submodule pointer update

devsh · devsh · commit c7e42edede04 · 2024-08-18T00:03:32.000+02:00
and fix my silly bug
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 33b7ac9c9ff263eeb45ce643d99c073f99547b37
+Subproject commit 15468b0d4ceb50542d38070cca25733a5c559376
diff --git a/include/nbl/asset/IDescriptorSetLayout.h b/include/nbl/asset/IDescriptorSetLayout.h
@@ -466,9 +466,10 @@ class IDescriptorSetLayout : public IDescriptorSetLayoutBase
 			{
 				if ((b.type == IDescriptor::E_TYPE::ET_SAMPLER or b.type == IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER) and b.immutableSamplers)
 				{
-					const auto localOffset = m_immutableSamplerRedirect.getStorageOffset(typename CBindingRedirect::binding_number_t(b.binding)).data;
+					const auto localOffset = m_immutableSamplerRedirect.getStorageOffset(typename CBindingRedirect::binding_number_t(b.binding));
+					assert(bool(localOffset));
 
-					auto* dst = m_immutableSamplers->begin() + localOffset;
+					auto* dst = m_immutableSamplers->begin() + localOffset.data;
 					std::copy_n(b.immutableSamplers, b.count, dst);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -466,9 +466,10 @@ class IDescriptorSetLayout : public IDescriptorSetLayoutBase`
`466`	`466`	`{`
`467`	`467`	`if ((b.type == IDescriptor::E_TYPE::ET_SAMPLER or b.type == IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER) and b.immutableSamplers)`
`468`	`468`	`{`
`469`		`- const auto localOffset = m_immutableSamplerRedirect.getStorageOffset(typename CBindingRedirect::binding_number_t(b.binding)).data;`
	`469`	`+ const auto localOffset = m_immutableSamplerRedirect.getStorageOffset(typename CBindingRedirect::binding_number_t(b.binding));`
	`470`	`+ assert(bool(localOffset));`
`470`	`471`
`471`		`- auto* dst = m_immutableSamplers->begin() + localOffset;`
	`472`	`+ auto* dst = m_immutableSamplers->begin() + localOffset.data;`
`472`	`473`	`std::copy_n(b.immutableSamplers, b.count, dst);`
`473`	`474`	`}`
`474`	`475`	`}`