Skip to content

Commit e689e00

Browse files
committed
Update examples_tests submodule and some minor fixes for CComputeBlit
1 parent 2cec714 commit e689e00

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

include/nbl/video/utilities/CComputeBlit.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ class CComputeBlit : public core::IReferenceCounted
330330

331331
constexpr auto MaxImageDim = 1 << 16;
332332
const auto maxImageDims = core::vectorSIMDu32(MaxImageDim, MaxImageDim, MaxImageDim, MaxImageDim);
333-
assert((inDim < maxImageDims) && (outDim < maxImageDims));
333+
assert((inDim.x < maxImageDims.x) && (inDim.y < maxImageDims.y) && (inDim.z < maxImageDims.z));
334+
assert((outDim.x < maxImageDims.x) && (outDim.y < maxImageDims.y) && (outDim.z < maxImageDims.z));
334335

335336
outPC.dims.x = (outDim.x << 16) | inDim.x;
336337
outPC.dims.y = (outDim.y << 16) | inDim.y;
@@ -358,10 +359,10 @@ class CComputeBlit : public core::IReferenceCounted
358359
outPC.outPixelCount = outImageExtent.x*outImageExtent.y*outImageExtent.z;
359360

360361
const core::vectorSIMDi32 windowDim = core::max(blit_utils_t::getRealWindowSize(imageType, scaledKernelX, scaledKernelY, scaledKernelZ), core::vectorSIMDi32(1, 1, 1, 1));
361-
assert(windowDim < maxImageDims);
362+
assert((windowDim.x < maxImageDims.x) && (windowDim.y < maxImageDims.y) && (windowDim.z < maxImageDims.z));
362363

363364
const core::vectorSIMDu32 phaseCount = asset::IBlitUtilities::getPhaseCount(inImageExtent, outImageExtent, imageType);
364-
assert(phaseCount < maxImageDims);
365+
assert((phaseCount.x < maxImageDims.x) && (phaseCount.y < maxImageDims.y) && (phaseCount.z < maxImageDims.z));
365366

366367
outPC.windowDimPhaseCount.x = (phaseCount.x << 16) | windowDim.x;
367368
outPC.windowDimPhaseCount.y = (phaseCount.y << 16) | windowDim.y;

0 commit comments

Comments
 (0)