Skip to content

Commit 9cf08ea

Browse files
alichraghialichraghi
committed
ICPUBuffer: update remaining usages
VS search is so busted Signed-off-by: Ali Cheraghi <alichraghi@proton.me>
1 parent aeaa1ce commit 9cf08ea

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

‎src/nbl/ext/DepthPyramidGenerator/DepthPyramidGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ layout(local_size_x = WORKGROUP_X_AND_Y_SIZE, local_size_y = WORKGROUP_X_AND_Y_S
9090
const uint32_t perPassMipCnt = static_cast<uint32_t>(config.workGroupSize) == 32u ? 6u : 5u;
9191

9292
constexpr size_t extraSize = 32u;
93-
auto shaderCode = ICPUBuffer::create({ .size = strlen(source) + extraSize + 1u });
93+
auto shaderCode = ICPUBuffer::create({ strlen(source) + extraSize + 1u });
9494
snprintf(reinterpret_cast<char*>(shaderCode->getPointer()), shaderCode->getSize(), source, static_cast<uint32_t>(m_config.workGroupSize), format, redOp, mipScaling);
9595

9696
auto cpuSpecializedShader = core::make_smart_refctd_ptr<asset::ICPUSpecializedShader>(

‎src/nbl/ext/FFT/FFT.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ layout(local_size_x=_NBL_GLSL_WORKGROUP_SIZE_, local_size_y=1, local_size_z=1) i
5454

5555
constexpr size_t extraSize = 8u*2u+1u;
5656

57-
auto source = ICPUBuffer::create({ .size = strlen(sourceFmt)+extraSize+1u });
57+
auto source = ICPUBuffer::create({ strlen(sourceFmt)+extraSize+1u });
5858
snprintf(
5959
reinterpret_cast<char*>(source->getPointer()),source->getSize(), sourceFmt,
6060
DEFAULT_WORK_GROUP_SIZE,

‎src/nbl/ext/LumaMeter/CLumaMeter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void main()
178178
const size_t xyzMatrixChars = strlen(xyzMatrix);
179179
const size_t extraSize = lumaChars+meterModeChars+eotfChars+xyzMatrixChars;
180180

181-
auto shader = ICPUBuffer::create({ .size = strlen(sourceFmt)+extraSize+1u });
181+
auto shader = ICPUBuffer::create({ strlen(sourceFmt)+extraSize+1u });
182182
snprintf(
183183
reinterpret_cast<char*>(shader->getPointer()),shader->getSize(),sourceFmt,
184184
DEFAULT_BIN_COUNT,DEFAULT_BIN_GLOBAL_REPLICATION,

‎src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static core::smart_refctd_ptr<asset::ICPUImage> createSingleChannelImage(const a
320320
}
321321
const size_t texelBytesz = asset::getTexelOrBlockBytesize(outParams.format);
322322
region.bufferRowLength = asset::IImageAssetHandlerBase::calcPitchInBlocks(outParams.extent.width, texelBytesz);
323-
auto buffer = asset::ICPUBuffer::create({ .size = texelBytesz * region.bufferRowLength * outParams.extent.height });
323+
auto buffer = asset::ICPUBuffer::create({ texelBytesz * region.bufferRowLength * outParams.extent.height });
324324
region.imageOffset = { 0,0,0 };
325325
region.imageExtent = outParams.extent;
326326
region.imageSubresource.baseArrayLayer = 0u;
@@ -848,7 +848,7 @@ SContext::shape_ass_type CMitsubaLoader::loadBasicShape(SContext& ctx, uint32_t
848848
if (totalVertexCount)
849849
{
850850
constexpr uint32_t hidefRGBSize = 4u;
851-
auto newRGBbuff = asset::ICPUBuffer::create({ .size = hidefRGBSize*totalVertexCount });
851+
auto newRGBbuff = asset::ICPUBuffer::create({ hidefRGBSize*totalVertexCount });
852852
newMesh = core::smart_refctd_ptr_static_cast<asset::ICPUMesh>(mesh->clone(1u));
853853
constexpr uint32_t COLOR_ATTR = 1u;
854854
constexpr uint32_t COLOR_BUF_BINDING = 15u;
@@ -1196,7 +1196,7 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
11961196

11971197
auto d = ds0->getDescriptors(PRECOMPUTED_VT_DATA_BINDING).begin();
11981198
{
1199-
auto precompDataBuf = ICPUBuffer::create({ .size = sizeof(asset::ICPUVirtualTexture::SPrecomputedData) });
1199+
auto precompDataBuf = ICPUBuffer::create({ sizeof(asset::ICPUVirtualTexture::SPrecomputedData) });
12001200
memcpy(precompDataBuf->getPointer(), &_ctx.backend_ctx.vt.vt->getPrecomputedData(), precompDataBuf->getSize());
12011201

12021202
d->buffer.offset = 0u;
@@ -1205,7 +1205,7 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
12051205
}
12061206
d = ds0->getDescriptors(INSTR_BUF_BINDING).begin();
12071207
{
1208-
auto instrbuf = ICPUBuffer::create({ .size = _compResult.instructions.size()*sizeof(decltype(_compResult.instructions)::value_type) });
1208+
auto instrbuf = ICPUBuffer::create({ _compResult.instructions.size()*sizeof(decltype(_compResult.instructions)::value_type) });
12091209
memcpy(instrbuf->getPointer(), _compResult.instructions.data(), instrbuf->getSize());
12101210

12111211
d->buffer.offset = 0u;
@@ -1214,7 +1214,7 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
12141214
}
12151215
d = ds0->getDescriptors(BSDF_BUF_BINDING).begin();
12161216
{
1217-
auto bsdfbuf = ICPUBuffer::create({ .size = _compResult.bsdfData.size()*sizeof(decltype(_compResult.bsdfData)::value_type) });
1217+
auto bsdfbuf = ICPUBuffer::create({ _compResult.bsdfData.size()*sizeof(decltype(_compResult.bsdfData)::value_type) });
12181218
memcpy(bsdfbuf->getPointer(), _compResult.bsdfData.data(), bsdfbuf->getSize());
12191219

12201220
d->buffer.offset = 0u;
@@ -1226,7 +1226,7 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
12261226
const size_t sz = _compResult.prefetch_stream.size()*sizeof(decltype(_compResult.prefetch_stream)::value_type);
12271227

12281228
constexpr size_t MIN_SSBO_SZ = 128ull; //prefetch stream won't be generated if no textures are used, so make sure we're not creating 0-size buffer
1229-
auto prefetch_instr_buf = ICPUBuffer::create({ .size = std::max(MIN_SSBO_SZ, sz) });
1229+
auto prefetch_instr_buf = ICPUBuffer::create({ std::max(MIN_SSBO_SZ, sz) });
12301230
memcpy(prefetch_instr_buf->getPointer(), _compResult.prefetch_stream.data(), sz);
12311231

12321232
d->buffer.offset = 0u;
@@ -1295,7 +1295,7 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
12951295
#endif
12961296
d = ds0->getDescriptors(INSTANCE_DATA_BINDING).begin();
12971297
{
1298-
auto instDataBuf = ICPUBuffer::create({ .size = instanceData.size()*sizeof(nbl_glsl_ext_Mitsuba_Loader_instance_data_t) });
1298+
auto instDataBuf = ICPUBuffer::create({ instanceData.size()*sizeof(nbl_glsl_ext_Mitsuba_Loader_instance_data_t) });
12991299
memcpy(instDataBuf->getPointer(), instanceData.data(), instDataBuf->getSize());
13001300

13011301
d->buffer.offset = 0u;

‎src/nbl/ext/MitsubaLoader/CSerializedLoader.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,18 +227,18 @@ asset::SAssetBundle CSerializedLoader::loadAsset(system::IFile* _file, const ass
227227
continue;
228228
}
229229

230-
auto indexbuf = asset::ICPUBuffer::create({ .size = indexDataSize });
230+
auto indexbuf = asset::ICPUBuffer::create({ indexDataSize });
231231
const uint32_t posAttrSize = typeSize*3u;
232-
auto posbuf = asset::ICPUBuffer::create({ .size = vertexCount*posAttrSize });
232+
auto posbuf = asset::ICPUBuffer::create({ vertexCount*posAttrSize });
233233
core::smart_refctd_ptr<asset::ICPUBuffer> normalbuf,uvbuf,colorbuf;
234234
if (requiresNormals)
235-
normalbuf = asset::ICPUBuffer::create({ .size = sizeof(uint32_t)*vertexCount });
235+
normalbuf = asset::ICPUBuffer::create({ sizeof(uint32_t)*vertexCount });
236236
// TODO: UV quantization and optimization (maybe lets just always use half floats?)
237237
constexpr size_t uvAttrSize = sizeof(float)*2u;
238238
if (hasUVs)
239-
uvbuf = asset::ICPUBuffer::create({ .size = uvAttrSize*vertexCount });
239+
uvbuf = asset::ICPUBuffer::create({ uvAttrSize*vertexCount });
240240
if (hasColors)
241-
colorbuf = asset::ICPUBuffer::create({ .size = sizeof(uint32_t)*vertexCount });
241+
colorbuf = asset::ICPUBuffer::create({ sizeof(uint32_t)*vertexCount });
242242

243243
void* posPtr = posbuf->getPointer();
244244
CQuantNormalCache::value_type_t<EF_A2B10G10R10_SNORM_PACK32>* normalPtr = !normalbuf ? nullptr:reinterpret_cast<CQuantNormalCache::value_type_t<EF_A2B10G10R10_SNORM_PACK32>*>(normalbuf->getPointer());

‎src/nbl/ext/RadixSort/RadixSort.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ layout (local_size_x = _NBL_GLSL_WORKGROUP_SIZE_) in;
9292
// Todo: This just the value I took from FFT example, don't know how it is being computed.
9393
const size_t extraSize = 4u + 8u + 8u + 128u;
9494

95-
auto shader = asset::ICPUBuffer::create({ .size = strlen(source_fmt) + extraSize + 1u });
95+
auto shader = asset::ICPUBuffer::create({ strlen(source_fmt) + extraSize + 1u });
9696
snprintf(reinterpret_cast<char*>(shader->getPointer()), shader->getSize(), source_fmt, m_wg_size, BUCKETS_COUNT, shader_file_path);
9797

9898
auto cpu_specialized_shader = core::make_smart_refctd_ptr<asset::ICPUSpecializedShader>(
@@ -123,7 +123,7 @@ layout (local_size_x = _NBL_GLSL_WORKGROUP_SIZE_) in;
123123
// Todo: This just the value I took from FFT example, don't know how it is being computed.
124124
const size_t extraSize = 4u + 8u + 8u + 128u;
125125

126-
auto shader = asset::ICPUBuffer::create({ .size = strlen(source_fmt) + extraSize + 1u });
126+
auto shader = asset::ICPUBuffer::create({ strlen(source_fmt) + extraSize + 1u });
127127
snprintf(reinterpret_cast<char*>(shader->getPointer()), shader->getSize(), source_fmt, m_wg_size, shader_file_path);
128128

129129
auto cpu_specialized_shader = core::make_smart_refctd_ptr<asset::ICPUSpecializedShader>(

‎src/nbl/ext/ToneMapper/CToneMapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ void main()
498498
usingTemporalAdaptationDefineChars+
499499
outViewFormatQualifierChars+eotfChars+inXYZMatrixChars+outXYZMatrixChars+oetfChars+quantizationChars;
500500

501-
auto shader = ICPUBuffer::create({ .size = strlen(sourceFmt)+extraSize+1u });
501+
auto shader = ICPUBuffer::create({ strlen(sourceFmt)+extraSize+1u });
502502
snprintf(
503503
reinterpret_cast<char*>(shader->getPointer()),shader->getSize(),sourceFmt,
504504
DEFAULT_WORKGROUP_DIM,DEFAULT_WORKGROUP_DIM,_operator,

0 commit comments

Comments
 (0)