Skip to content

Commit 361951c

Browse files
fix some fuckups
1 parent 74f31f3 commit 361951c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

include/nbl/asset/IMeshPackerV2.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,9 @@ uint32_t IMeshPackerV2<MeshBufferType, BufferType, MDIStructType>::calcMDIStruct
302302
uint32_t acc = 0u;
303303
for (auto mbIt = mbBegin; mbIt != mbEnd; mbIt++)
304304
{
305-
const size_t idxCnt = (*mbIt)->getIndexCount();
305+
auto mb = *mbIt;
306+
assert(mb->getPipeline()->getPrimitiveAssemblyParams().primitiveType==EPT_TRIANGLE_LIST);
307+
const size_t idxCnt = mb->getIndexCount();
306308
const uint32_t triCnt = idxCnt / 3;
307309
assert(idxCnt % 3 == 0);
308310

include/nbl/asset/utils/IMeshPacker.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,12 @@ class IMeshPacker : public IMeshPackerBase
125125
return size;
126126
}
127127

128-
inline constexpr uint32_t calcBatchCount(uint32_t triCnt) { return (triCnt + m_maxTriangleCountPerMDIData - 1) / m_maxTriangleCountPerMDIData; }
128+
inline constexpr uint32_t calcBatchCount(uint32_t triCnt)
129+
{
130+
if (triCnt!=0u)
131+
return (triCnt-1u)/m_minTriangleCountPerMDIData+1u;
132+
return 0u;
133+
}
129134

130135
struct Triangle
131136
{

0 commit comments

Comments
 (0)