Skip to content

Commit dfc786c

Browse files
committed
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla
2 parents 2da75a1 + 1abb6ae commit dfc786c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/nbl/video/utilities/CAssetConverter.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1856,6 +1856,8 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
18561856
for (uint16_t l=1; l<patch.mipLevels; l++)
18571857
{
18581858
const auto levelMask = 0x1<<(l-1);
1859+
if ((patch.recomputeMips&levelMask)==0)
1860+
continue;
18591861
const auto prevLevel = l-1;
18601862
const auto prevLevelMask = 0x1<<(prevLevel-1);
18611863
// marked as recompute but has no source data on previous level
@@ -3586,7 +3588,7 @@ ISemaphore::future_t<IQueue::RESULT> CAssetConverter::convert_impl(SReserveResul
35863588
if (submitsNeeded.hasFlags(IQueue::FAMILY_FLAGS::TRANSFER_BIT))
35873589
{
35883590
constexpr auto emptySignalSpan = std::span<const IQueue::SSubmitInfo::SSemaphoreInfo>{};
3589-
if (params.transfer->submit(xferCmdBuf,computeSubmitIsNeeded ? emptySignalSpan:params.extraSignalSemaphores)!=IQueue::RESULT::SUCCESS)
3591+
if (params.transfer->submit(xferCmdBuf,computeSubmitIsNeeded ? params.extraSignalSemaphores:emptySignalSpan)!=IQueue::RESULT::SUCCESS)
35903592
return retval;
35913593
// leave open for next user
35923594
params.transfer->beginNextCommandBuffer(xferCmdBuf);

0 commit comments

Comments
 (0)