Merge pull request #802 from Devsh-Graphics-Programming/ali_size

ICPUBuffer: remove size field from creation params

Author: devshgraphicsprogramming

include/nbl/asset/ICPUBuffer.h

@@ -27,10 +27,9 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
     public:
         struct SCreationParams : asset::IBuffer::SCreationParams
         {
-            size_t size; // WHY IS THIS SHADOWING THE `asset::IBuffer::SCreationParams` !?
             void* data = nullptr;
-            size_t alignment = _NBL_SIMD_ALIGNMENT;
             core::smart_refctd_ptr<core::refctd_memory_resource> memoryResource = nullptr;
+            size_t alignment = _NBL_SIMD_ALIGNMENT;
 
             SCreationParams& operator =(const asset::IBuffer::SCreationParams& rhs)
             {
@@ -67,7 +66,7 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
 
         core::smart_refctd_ptr<IAsset> clone(uint32_t = ~0u) const override final
         {
-            auto cp = create({ .size = m_creationParams.size, .data = m_data, .alignment = m_alignment });
+            auto cp = create({ { m_creationParams.size }, m_data, nullptr, m_alignment });
             memcpy(cp->getPointer(), m_data, m_creationParams.size);
             cp->setContentHash(getContentHash());
             return cp;

include/nbl/asset/ICPUShader.h

@@ -33,7 +33,7 @@ class ICPUShader : public IAsset, public IShader
 			: IShader(stage, std::move(filepathHint)), m_code(std::move(code)), m_contentType(contentType) {}
 
 		ICPUShader(const char* code, const E_SHADER_STAGE stage, const E_CONTENT_TYPE contentType, std::string&& filepathHint)
-			: ICPUShader(ICPUBuffer::create({ .size = strlen(code) + 1u }), stage, contentType, std::move(filepathHint))
+			: ICPUShader(ICPUBuffer::create({ strlen(code) + 1u }), stage, contentType, std::move(filepathHint))
 		{
 			assert(contentType != E_CONTENT_TYPE::ECT_SPIRV); // because using strlen needs `code` to be null-terminated
 			memcpy(m_code->getPointer(), code, m_code->getSize());

include/nbl/asset/filters/CFlattenRegionsImageFilter.h

@@ -89,7 +89,7 @@ class CFlattenRegionsImageFilter : public CImageFilter<CFlattenRegionsImageFilte
 					assert(memsize.getNumerator()%memsize.getDenominator()==0u);
 					bufferSize += memsize.getIntegerApprox();
 				}
-				auto buffer = ICPUBuffer::create({ .size = bufferSize });
+				auto buffer = ICPUBuffer::create({ bufferSize });
 				state->outImage->setBufferAndRegions(std::move(buffer),std::move(regions));
 			};
 

include/nbl/asset/filters/dithering/CPrecomputedDither.h

@@ -58,7 +58,7 @@ namespace nbl
 							const size_t newDecodeBufferSize = extent.x * extent.y * extent.z * creationParams.arrayLayers * decodeTexelByteSize;
 
 							const core::vector3du32_SIMD decodeBufferByteStrides = TexelBlockInfo(decodeFormat).convert3DTexelStridesTo1DByteStrides(core::vector3du32_SIMD(extent.x, extent.y, extent.z));
-							auto decodeFlattenBuffer = ICPUBuffer::create({ .size = newDecodeBufferSize });
+							auto decodeFlattenBuffer = ICPUBuffer::create({ newDecodeBufferSize });
 							decodeFlattenBuffer->setContentHash(IPreHashed::INVALID_HASH);
 
 							auto* inData = reinterpret_cast<uint8_t*>(flattenDitheringImage->getBuffer()->getPointer());

include/nbl/asset/interchange/IImageAssetHandlerBase.h

@@ -110,7 +110,7 @@ class IImageAssetHandlerBase : public virtual core::IReferenceCounted
 					bufferSize += memsize.getIntegerApprox();
 				}
 
-				auto texelBuffer = ICPUBuffer::create({ .size = bufferSize });
+				auto texelBuffer = ICPUBuffer::create({ bufferSize });
 				newImage->setBufferAndRegions(std::move(texelBuffer), newRegions);
 				newImage->setContentHash(IPreHashed::INVALID_HASH);
 			}

include/nbl/asset/utils/CDirQuantCacheBase.h

@@ -297,7 +297,7 @@ class CDirQuantCacheBase : public impl::CDirQuantCacheBase
 			if (!file)
 				return false;
 
-			auto buffer = asset::ICPUBuffer::create({ .size = file->getSize() });
+			auto buffer = asset::ICPUBuffer::create({ file->getSize() });
 
 			system::IFile::success_t succ;
 			file->read(succ, buffer->getPointer(), 0, file->getSize());
@@ -346,7 +346,7 @@ class CDirQuantCacheBase : public impl::CDirQuantCacheBase
 			asset::SBufferRange<asset::ICPUBuffer> bufferRange;
 			bufferRange.offset = 0;
 			bufferRange.size = getSerializedCacheSizeInBytes<CacheFormat>();
-			bufferRange.buffer = asset::ICPUBuffer::create({ .size = bufferRange.size });
+			bufferRange.buffer = asset::ICPUBuffer::create({ bufferRange.size });
 
 			saveCacheToBuffer<CacheFormat>(bufferRange);
 

include/nbl/asset/utils/IMeshManipulator.h

@@ -557,7 +557,7 @@ class NBL_API2 IMeshManipulator : public virtual core::IReferenceCounted
 			core::smart_refctd_ptr<ICPUBuffer> iotaUint32Buffer;
 			if (iotaLength)
 			{
-				iotaUint32Buffer = ICPUBuffer::create({ .size = sizeof(uint32_t)*iotaLength });
+				iotaUint32Buffer = ICPUBuffer::create({ sizeof(uint32_t)*iotaLength });
 				auto ptr = reinterpret_cast<uint32_t*>(iotaUint32Buffer->getPointer());
 				std::iota(ptr,ptr+iotaLength,0u);
 			}
@@ -599,13 +599,13 @@ class NBL_API2 IMeshManipulator : public virtual core::IReferenceCounted
 							if (indexType==EIT_16BIT)
 							{
 								auto inPtr = reinterpret_cast<const uint16_t*>(correctlyOffsetIndexBufferPtr);
-								newIndexBuffer = ICPUBuffer::create({ .size = sizeof(uint32_t)*indexCount });
+								newIndexBuffer = ICPUBuffer::create({ sizeof(uint32_t)*indexCount });
 								std::copy(inPtr,inPtr+indexCount,reinterpret_cast<uint32_t*>(newIndexBuffer->getPointer()));
 							}
 							else
 							{
 								auto inPtr = reinterpret_cast<const uint32_t*>(correctlyOffsetIndexBufferPtr);
-								newIndexBuffer = ICPUBuffer::create({ .size = sizeof(uint16_t)*indexCount });
+								newIndexBuffer = ICPUBuffer::create({ sizeof(uint16_t)*indexCount });
 								std::copy(inPtr,inPtr+indexCount,reinterpret_cast<uint16_t*>(newIndexBuffer->getPointer()));
 							}
 						}

include/nbl/asset/utils/IShaderCompiler.h

@@ -526,7 +526,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 			constexpr size_t nullTerminatorSize = 1u;
 			size_t outSize = origLen + formatArgsCharSize + formatSize + nullTerminatorSize - 2 * templateArgsCount;
 
-			nbl::core::smart_refctd_ptr<ICPUBuffer> outBuffer = ICPUBuffer::create({ .size = outSize });
+			nbl::core::smart_refctd_ptr<ICPUBuffer> outBuffer = ICPUBuffer::create({ outSize });
 
 			auto origCode = std::string_view(reinterpret_cast<const char*>(original->getContent()->getPointer()), origLen);
 			auto outCode = reinterpret_cast<char*>(outBuffer->getPointer());

include/nbl/ext/ScreenShot/ScreenShot.h

@@ -154,7 +154,7 @@ inline core::smart_refctd_ptr<ICPUImageView> createScreenShot(
 		region.imageOffset = { 0u, 0u, 0u };
 		region.imageExtent = cpuNewImage->getCreationParameters().extent;
 
-		auto cpuNewTexelBuffer = ICPUBuffer::create({ .size = gpuTexelBufferSize });
+		auto cpuNewTexelBuffer = ICPUBuffer::create({ gpuTexelBufferSize });
 		{
 			memcpy(cpuNewTexelBuffer->getPointer(), gpuTexelBuffer->getBoundMemory().memory->getMappedPointer(), gpuTexelBuffer->getSize());
 		}

include/nbl/scene/ISkinInstanceCacheManager.h

@@ -38,7 +38,7 @@ class ISkinInstanceCacheManager : public virtual core::IReferenceCounted
 				auto glslFile = loadBuiltinData(uniqueString);
 				core::smart_refctd_ptr<asset::ICPUBuffer> glsl;
 				{
-					glsl = asset::ICPUBuffer::create({ .size = glslFile->getSize() });
+					glsl = asset::ICPUBuffer::create({ glslFile->getSize() });
 					memcpy(glsl->getPointer(), glslFile->getMappedPointer(), glsl->getSize());
 				}
 				auto shader = device->createShader(core::make_smart_refctd_ptr<asset::ICPUShader>(core::smart_refctd_ptr(glsl), type, asset::IShader::E_CONTENT_TYPE::ECT_GLSL, ""));