Fix #798

devsh · devsh · commit 1f6daf127334 · 2024-12-12T12:51:43.000+01:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 96b1826cf037d24bcef0b0b494a58252e008327e
+Subproject commit ec042d74866056f956f24f044f8fdb26d5040213
diff --git a/src/nbl/video/utilities/CAssetConverter.cpp b/src/nbl/video/utilities/CAssetConverter.cpp
@@ -1703,13 +1703,14 @@ class GetDependantVisit<ICPUDescriptorSet> : public GetDependantVisitBase<ICPUDe
 					outInfo.info.buffer.size = std::get<0>(argTuple).size;
 				}
 			}
-			if constexpr (std::is_same_v<DepType,ICPUImage>)
+			if constexpr (std::is_same_v<DepType,ICPUImageView>)
 			{
 				outInfo.info.image.imageLayout = std::get<0>(argTuple);
 				if (type==IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER)
 				{
 					assert(lastCombinedSampler);
-					outInfo.info.combinedImageSampler = std::get<1>(argTuple);
+					outInfo.info.combinedImageSampler.sampler = smart_refctd_ptr<IGPUSampler>(lastCombinedSampler);
+					lastCombinedSampler = nullptr; // for debuggability
 				}
 			}
 			return true;

Original file line number	Diff line number	Diff line change
`@@ -1703,13 +1703,14 @@ class GetDependantVisit<ICPUDescriptorSet> : public GetDependantVisitBase<ICPUDe`
`1703`	`1703`	`outInfo.info.buffer.size = std::get<0>(argTuple).size;`
`1704`	`1704`	`}`
`1705`	`1705`	`}`
`1706`		`- if constexpr (std::is_same_v<DepType,ICPUImage>)`
	`1706`	`+ if constexpr (std::is_same_v<DepType,ICPUImageView>)`
`1707`	`1707`	`{`
`1708`	`1708`	`outInfo.info.image.imageLayout = std::get<0>(argTuple);`
`1709`	`1709`	`if (type==IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER)`
`1710`	`1710`	`{`
`1711`	`1711`	`assert(lastCombinedSampler);`
`1712`		`- outInfo.info.combinedImageSampler = std::get<1>(argTuple);`
	`1712`	`+ outInfo.info.combinedImageSampler.sampler = smart_refctd_ptr<IGPUSampler>(lastCombinedSampler);`
	`1713`	`+ lastCombinedSampler = nullptr; // for debuggability`
`1713`	`1714`	`}`
`1714`	`1715`	`}`
`1715`	`1716`	`return true;`