Skip to content

Commit 561ae59

Browse files
Przemog1Przemog1
committed
Corrections
1 parent 8007a9a commit 561ae59

11 files changed

+60
-539
lines changed

‎include/nbl/asset/IShader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class IShader : public virtual core::IReferenceCounted
7474
for (const std::string& ext : (*_exts))
7575
{
7676
std::string str = "#ifndef " + ext + "\n";
77-
str += "\t#define IRR_" + ext + "\n";
77+
str += "\t#define NBL_" + ext + "\n";
7878
str += "#endif //" + ext + "\n";
7979

8080
insertion += str;

‎source/Nabla/CBAWMeshFileLoader.cpp

+24-24
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ICPUMesh* CBAWMeshFileLoader::createMesh(io::IReadFile * _file, unsigned char _p
6666
if (data.header->blobType == core::Blob::EBT_MESH || data.header->blobType == core::Blob::EBT_SKINNED_MESH)
6767
meshBlobDataIter = it;
6868
}
69-
_IRR_ALIGNED_FREE(offsets);
69+
_NBL_ALIGNED_FREE(offsets);
7070

7171
const core::BlobLoadingParams params{ m_sceneMgr, m_fileSystem, ctx.filePath };
7272
core::stack<SBlobData*> toLoad, toFinalize;
@@ -84,7 +84,7 @@ ICPUMesh* CBAWMeshFileLoader::createMesh(io::IReadFile * _file, unsigned char _p
8484
if (!blob)
8585
{
8686
ctx.releaseLoadedObjects();
87-
_IRR_ALIGNED_FREE(headers);
87+
_NBL_ALIGNED_FREE(headers);
8888
return NULL;
8989
}
9090

@@ -98,14 +98,14 @@ ICPUMesh* CBAWMeshFileLoader::createMesh(io::IReadFile * _file, unsigned char _p
9898
if (fail)
9999
{
100100
ctx.releaseLoadedObjects();
101-
_IRR_ALIGNED_FREE(headers);
101+
_NBL_ALIGNED_FREE(headers);
102102
return NULL;
103103
}
104104

105105
if (!deps.size())
106106
{
107107
ctx.loadingMgr.finalize(blobType, ctx.createdObjs[handle], blob, size, ctx.createdObjs, params);
108-
_IRR_ALIGNED_FREE(data->heapBlob);
108+
_NBL_ALIGNED_FREE(data->heapBlob);
109109
blob = data->heapBlob = NULL;
110110
}
111111
else
@@ -127,7 +127,7 @@ ICPUMesh* CBAWMeshFileLoader::createMesh(io::IReadFile * _file, unsigned char _p
127127
}
128128

129129
ctx.releaseAllButThisOne(meshBlobDataIter); // call drop on all loaded objects except mesh
130-
_IRR_ALIGNED_FREE(headers);
130+
_NBL_ALIGNED_FREE(headers);
131131

132132
#ifdef _DEBUG
133133
std::ostringstream tmpString("Time to load ");
@@ -167,8 +167,8 @@ bool CBAWMeshFileLoader::validateHeaders(uint32_t* _blobCnt, uint32_t** _offsets
167167
return false;
168168
if (!safeRead(_ctx.file, _ctx.iv, 16))
169169
return false;
170-
uint32_t* const offsets = *_offsets = (uint32_t*)_IRR_ALIGNED_MALLOC(*_blobCnt * sizeof(uint32_t),_IRR_SIMD_ALIGNMENT);
171-
*_headers = _IRR_ALIGNED_MALLOC(*_blobCnt * sizeof(core::BlobHeaderV0),_IRR_SIMD_ALIGNMENT);
170+
uint32_t* const offsets = *_offsets = (uint32_t*)_NBL_ALIGNED_MALLOC(*_blobCnt * sizeof(uint32_t),_NBL_SIMD_ALIGNMENT);
171+
*_headers = _NBL_ALIGNED_MALLOC(*_blobCnt * sizeof(core::BlobHeaderV0),_NBL_SIMD_ALIGNMENT);
172172
core::BlobHeaderV0* const headers = (core::BlobHeaderV0*)*_headers;
173173

174174
bool nope = false;
@@ -195,8 +195,8 @@ bool CBAWMeshFileLoader::validateHeaders(uint32_t* _blobCnt, uint32_t** _offsets
195195

196196
if (nope)
197197
{
198-
_IRR_ALIGNED_FREE(offsets);
199-
_IRR_ALIGNED_FREE(*_headers);
198+
_NBL_ALIGNED_FREE(offsets);
199+
_NBL_ALIGNED_FREE(*_headers);
200200
return false;
201201
}
202202
return true;
@@ -216,14 +216,14 @@ void* CBAWMeshFileLoader::tryReadBlobOnStack(const SBlobData & _data, SContext &
216216
if (_stackPtr && _data.header->blobSizeDecompr <= _stackSize && _data.header->effectiveSize() <= _stackSize)
217217
dst = _stackPtr;
218218
else
219-
dst = _IRR_ALIGNED_MALLOC(core::BlobHeaderV0::calcEncSize(_data.header->blobSizeDecompr),_IRR_SIMD_ALIGNMENT);
219+
dst = _NBL_ALIGNED_MALLOC(core::BlobHeaderV0::calcEncSize(_data.header->blobSizeDecompr),_NBL_SIMD_ALIGNMENT);
220220

221221
const bool encrypted = (_data.header->compressionType & core::Blob::EBCT_AES128_GCM);
222222
const bool compressed = (_data.header->compressionType & core::Blob::EBCT_LZ4) || (_data.header->compressionType & core::Blob::EBCT_LZMA);
223223

224224
void* dstCompressed = dst; // ptr to mem to load possibly compressed data
225225
if (compressed)
226-
dstCompressed = _IRR_ALIGNED_MALLOC(_data.header->effectiveSize(),_IRR_SIMD_ALIGNMENT);
226+
dstCompressed = _NBL_ALIGNED_MALLOC(_data.header->effectiveSize(),_NBL_SIMD_ALIGNMENT);
227227

228228
_ctx.file->seek(_data.absOffset);
229229
_ctx.file->read(dstCompressed, _data.header->effectiveSize());
@@ -235,28 +235,28 @@ void* CBAWMeshFileLoader::tryReadBlobOnStack(const SBlobData & _data, SContext &
235235
#endif
236236
if (compressed)
237237
{
238-
_IRR_ALIGNED_FREE(dstCompressed);
238+
_NBL_ALIGNED_FREE(dstCompressed);
239239
if (dst != _stackPtr)
240-
_IRR_ALIGNED_FREE(dst);
240+
_NBL_ALIGNED_FREE(dst);
241241
}
242242
else if (dst != _stackPtr)
243-
_IRR_ALIGNED_FREE(dstCompressed);
243+
_NBL_ALIGNED_FREE(dstCompressed);
244244
return NULL;
245245
}
246246

247247
if (encrypted)
248248
{
249-
#ifdef _IRR_COMPILE_WITH_OPENSSL_
249+
#ifdef _NBL_COMPILE_WITH_OPENSSL_
250250
const size_t size = _data.header->effectiveSize();
251-
void* out = _IRR_ALIGNED_MALLOC(size,_IRR_SIMD_ALIGNMENT);
251+
void* out = _NBL_ALIGNED_MALLOC(size,_NBL_SIMD_ALIGNMENT);
252252
const bool ok = core::decAes128gcm(dstCompressed, size, out, size, _pwd, _ctx.iv, _data.header->gcmTag);
253253
if (dstCompressed != _stackPtr)
254-
_IRR_ALIGNED_FREE(dstCompressed);
254+
_NBL_ALIGNED_FREE(dstCompressed);
255255
if (!ok)
256256
{
257257
if (dst != _stackPtr && dstCompressed != dst)
258-
_IRR_ALIGNED_FREE(dst);
259-
_IRR_ALIGNED_FREE(out);
258+
_NBL_ALIGNED_FREE(dst);
259+
_NBL_ALIGNED_FREE(out);
260260
#ifdef _DEBUG
261261
os::Printer::log("Blob decryption failed!", ELL_ERROR);
262262
#endif
@@ -268,12 +268,12 @@ void* CBAWMeshFileLoader::tryReadBlobOnStack(const SBlobData & _data, SContext &
268268
#else
269269
if (compressed)
270270
{
271-
_IRR_ALIGNED_FREE(dstCompressed);
271+
_NBL_ALIGNED_FREE(dstCompressed);
272272
if (dst != _stackPtr)
273-
_IRR_ALIGNED_FREE(dst);
273+
_NBL_ALIGNED_FREE(dst);
274274
}
275275
else if (dst != _stackPtr)
276-
_IRR_ALIGNED_FREE(dstCompressed);
276+
_NBL_ALIGNED_FREE(dstCompressed);
277277
return NULL;
278278
#endif
279279
}
@@ -288,11 +288,11 @@ void* CBAWMeshFileLoader::tryReadBlobOnStack(const SBlobData & _data, SContext &
288288
else if (comprType & core::Blob::EBCT_LZMA)
289289
res = decompressLzma(dst, _data.header->blobSizeDecompr, dstCompressed, _data.header->blobSize);
290290

291-
_IRR_ALIGNED_FREE(dstCompressed);
291+
_NBL_ALIGNED_FREE(dstCompressed);
292292
if (!res)
293293
{
294294
if (dst != _stackPtr && dst != dstCompressed)
295-
_IRR_ALIGNED_FREE(dst);
295+
_NBL_ALIGNED_FREE(dst);
296296
#ifdef _DEBUG
297297
os::Printer::log("Blob decompression failed!", ELL_ERROR);
298298
#endif

‎source/Nabla/CMeshSceneNodeInstanced.cpp

+17-17
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CMeshSceneNodeInstanced::CMeshSceneNodeInstanced(IDummyTransformationSceneNode*
2929
gpuCulledLodInstanceDataBuffer(), dataPerInstanceOutputSize(0),
3030
extraDataInstanceSize(0), dataPerInstanceInputSize(0)
3131
{
32-
#ifdef _IRR_DEBUG
32+
#ifdef _NBL_DEBUG
3333
setDebugName("CMeshSceneNodeInstanced");
3434
#endif
3535

@@ -44,7 +44,7 @@ CMeshSceneNodeInstanced::CMeshSceneNodeInstanced(IDummyTransformationSceneNode*
4444
CMeshSceneNodeInstanced::~CMeshSceneNodeInstanced()
4545
{
4646
if (instanceBBoxes)
47-
_IRR_ALIGNED_FREE(instanceBBoxes);
47+
_NBL_ALIGNED_FREE(instanceBBoxes);
4848
}
4949

5050

@@ -55,7 +55,7 @@ bool CMeshSceneNodeInstanced::setLoDMeshes(const core::vector<MeshLoD>& levelsOf
5555
xfb.clear();
5656

5757
if (instanceBBoxes)
58-
_IRR_ALIGNED_FREE(instanceBBoxes);
58+
_NBL_ALIGNED_FREE(instanceBBoxes);
5959
instanceDataAllocator = nullptr;
6060
instanceBBoxes = nullptr;
6161
gpuCulledLodInstanceDataBuffer = nullptr;
@@ -76,10 +76,10 @@ bool CMeshSceneNodeInstanced::setLoDMeshes(const core::vector<MeshLoD>& levelsOf
7676
return false;
7777
}
7878

79-
#ifdef _IRR_COMPILE_WITH_OPENGL_
79+
#ifdef _NBL_COMPILE_WITH_OPENGL_
8080
if (shaderLoDsPerPass>video::COpenGLExtensionHandler::MaxVertexStreams)
8181
return false;
82-
#endif // _IRR_COMPILE_WITH_OPENGL_
82+
#endif // _NBL_COMPILE_WITH_OPENGL_
8383
gpuLoDsPerPass = shaderLoDsPerPass;
8484

8585
extraDataInstanceSize = extraDataSizePerInstanceInput;
@@ -91,7 +91,7 @@ bool CMeshSceneNodeInstanced::setLoDMeshes(const core::vector<MeshLoD>& levelsOf
9191
auto buffSize = dataPerInstanceInputSize*512u;
9292
instanceDataAllocator = core::make_smart_refctd_ptr<decltype(instanceDataAllocator)::pointee>(driver,core::allocator<uint8_t>(),0u,0u,core::roundDownToPoT(dataPerInstanceInputSize),buffSize,dataPerInstanceInputSize,nullptr);
9393
instanceBBoxesCount = getCurrentInstanceCapacity();
94-
instanceBBoxes = (core::aabbox3df*)_IRR_ALIGNED_MALLOC(instanceBBoxesCount*sizeof(core::aabbox3df),_IRR_SIMD_ALIGNMENT);
94+
instanceBBoxes = (core::aabbox3df*)_NBL_ALIGNED_MALLOC(instanceBBoxesCount*sizeof(core::aabbox3df),_NBL_SIMD_ALIGNMENT);
9595
for (size_t i=0; i<instanceBBoxesCount; i++)
9696
{
9797
instanceBBoxes[i].MinEdge.set( FLT_MAX, FLT_MAX, FLT_MAX);
@@ -243,9 +243,9 @@ bool CMeshSceneNodeInstanced::addInstances(uint32_t* instanceIDs, const size_t&
243243
// kind-of realloc
244244
{
245245
size_t newSize = newCount*sizeof(core::aabbox3df);
246-
void* newPtr = _IRR_ALIGNED_MALLOC(newSize,_IRR_SIMD_ALIGNMENT);
246+
void* newPtr = _NBL_ALIGNED_MALLOC(newSize,_NBL_SIMD_ALIGNMENT);
247247
memcpy(newPtr,instanceBBoxes,std::min(instanceBBoxesCount*sizeof(core::aabbox3df),newSize));
248-
_IRR_ALIGNED_FREE(instanceBBoxes);
248+
_NBL_ALIGNED_FREE(instanceBBoxes);
249249
instanceBBoxes = (core::aabbox3df*)newPtr;
250250
}
251251
for (size_t i=instanceBBoxesCount; i<newCount; i++)
@@ -325,7 +325,7 @@ core::matrix3x4SIMD CMeshSceneNodeInstanced::getInstanceTransform(const uint32_t
325325
size_t redir = instanceDataAllocator->getAddressAllocator().get_real_addr(instanceID);
326326
if (redir==kInvalidInstanceID)
327327
{
328-
_IRR_BREAK_IF(true);
328+
_NBL_BREAK_IF(true);
329329
memset(retval.rows[0].pointer,0,48);
330330
}
331331
else
@@ -365,13 +365,13 @@ void CMeshSceneNodeInstanced::removeInstances(const size_t& instanceCount, const
365365
uint32_t minRedirect = kInvalidInstanceID;
366366
for (size_t i=0; i<instanceCount; i++)
367367
{
368-
IRR_PSEUDO_IF_CONSTEXPR_BEGIN(usesContiguousAddrAllocator)
368+
NBL_PSEUDO_IF_CONSTEXPR_BEGIN(usesContiguousAddrAllocator)
369369
{
370370
uint32_t redirect = instanceDataAllocator->getAddressAllocator().get_real_addr(instanceIDs[i]);
371371
if (redirect<minRedirect)
372372
minRedirect = redirect;
373373
}
374-
IRR_PSEUDO_IF_CONSTEXPR_END
374+
NBL_PSEUDO_IF_CONSTEXPR_END
375375

376376
uint32_t blockID = getBlockIDFromAddr(instanceIDs[i]);
377377
instanceBBoxes[blockID].MinEdge.set( FLT_MAX, FLT_MAX, FLT_MAX);
@@ -385,21 +385,21 @@ void CMeshSceneNodeInstanced::removeInstances(const size_t& instanceCount, const
385385
instanceDataAllocator->multi_free_addr(instanceCount,instanceIDs,static_cast<const uint32_t*>(dummyBytes));
386386
}
387387

388-
IRR_PSEUDO_IF_CONSTEXPR_BEGIN(usesContiguousAddrAllocator)
388+
NBL_PSEUDO_IF_CONSTEXPR_BEGIN(usesContiguousAddrAllocator)
389389
{
390390
// everything got shifted down by 1 so mark dirty
391391
instanceDataAllocator->markRangeForPush(minRedirect,core::address_allocator_traits<InstanceDataAddressAllocator>::get_allocated_size(instanceDataAllocator->getAddressAllocator()));
392392
}
393-
IRR_PSEUDO_IF_CONSTEXPR_END
393+
NBL_PSEUDO_IF_CONSTEXPR_END
394394

395395
if (getCurrentInstanceCapacity()!=instanceBBoxesCount)
396396
{
397397
size_t newCount = getCurrentInstanceCapacity();
398398
{ // kind-of realloc
399399
size_t newSize = newCount*sizeof(core::aabbox3df);
400-
void* newPtr = _IRR_ALIGNED_MALLOC(newSize,_IRR_SIMD_ALIGNMENT);
400+
void* newPtr = _NBL_ALIGNED_MALLOC(newSize,_NBL_SIMD_ALIGNMENT);
401401
memcpy(newPtr,instanceBBoxes,newSize);
402-
_IRR_ALIGNED_FREE(instanceBBoxes);
402+
_NBL_ALIGNED_FREE(instanceBBoxes);
403403
instanceBBoxes = (core::aabbox3df*)newPtr;
404404
}
405405
for (size_t i=instanceBBoxesCount; i<newCount; i++)
@@ -535,10 +535,10 @@ void CMeshSceneNodeInstanced::render()
535535

536536
if (flagQueryForRetrieval)
537537
{
538-
/*#ifdef _IRR_DEBUG
538+
/*#ifdef _NBL_DEBUG
539539
if (!LoD[LoD.size()-1].query->isQueryReady())
540540
os::Printer::log("GPU Culling Feedback Transform Instance Count Query Not Ready yet, STALLING CPU!\n",ELL_WARNING);
541-
#endif // _IRR_DEBUG*/
541+
#endif // _NBL_DEBUG*/
542542
for (size_t j=0; j<LoD.size(); j++)
543543
{
544544
uint32_t tmp;

‎source/Nabla/COpenGLExtensionHandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ void COpenGLExtensionHandler::loadFunctions()
10081008
pGlGetStringi = (PFNGLGETSTRINGIPROC) NBL_OGL_LOAD_EXTENSION("glGetStringi");
10091009

10101010
//should contain space-separated OpenGL extension names
1011-
constexpr const char* OPENGL_EXTS_ENVVAR_NAME = "_IRR_OPENGL_EXTENSIONS_LIST";//move this to some top-level header?
1011+
constexpr const char* OPENGL_EXTS_ENVVAR_NAME = "_NBL_OPENGL_EXTENSIONS_LIST";//move this to some top-level header?
10121012

10131013
const char* envvar = std::getenv(OPENGL_EXTS_ENVVAR_NAME);
10141014
if (!envvar)

0 commit comments

Comments
 (0)