Skip to content

Commit ca6f6f2

Browse files
committed
Updating examples to follow new spec following separable sampler changes
1 parent 67d0142 commit ca6f6f2

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

02_HelloCompute/main.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ class HelloComputeApp final : public nbl::application_templates::MonoSystemMonoL
151151
.createFlags=IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE, // not is not the time for descriptor indexing
152152
.stageFlags=IGPUShader::ESS_COMPUTE,
153153
.count=1,
154-
.samplers=nullptr // irrelevant for a buffer
155154
}
156155
};
157156
smart_refctd_ptr<IGPUDescriptorSetLayout> dsLayout = device->createDescriptorSetLayout(bindings);

03_DeviceSelectionAndSharedSources/Testers.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class PredefinedLayoutTester final : public IntrospectionTesterBase
203203
.createFlags = ICPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
204204
.stageFlags = ICPUShader::ESS_COMPUTE,
205205
.count = 1,
206-
.samplers = nullptr
206+
.immutableSamplers = nullptr
207207
}
208208
};
209209

@@ -215,15 +215,15 @@ class PredefinedLayoutTester final : public IntrospectionTesterBase
215215
.createFlags = ICPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
216216
.stageFlags = ICPUShader::ESS_COMPUTE,
217217
.count = 1,
218-
.samplers = nullptr
218+
.immutableSamplers = nullptr
219219
},
220220
{
221221
.binding = 1,
222222
.type = nbl::asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
223223
.createFlags = ICPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
224224
.stageFlags = ICPUShader::ESS_COMPUTE,
225225
.count = 2,
226-
.samplers = nullptr
226+
.immutableSamplers = nullptr
227227
}
228228
};
229229

07_StagingAndMultipleQueues/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,15 +276,15 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
276276
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
277277
.stageFlags = IGPUShader::E_SHADER_STAGE::ESS_COMPUTE,
278278
.count = 1,
279-
.samplers = nullptr
279+
.immutableSamplers = nullptr
280280
},
281281
{
282282
.binding = 1,
283283
.type = nbl::asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
284284
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
285285
.stageFlags = IGPUShader::E_SHADER_STAGE::ESS_COMPUTE,
286286
.count = 1,
287-
.samplers = nullptr
287+
.immutableSamplers = nullptr
288288
}
289289
};
290290

62_CAD/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,14 +589,14 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
589589
descriptorInfosSet0[3u].desc = drawResourcesFiller.gpuDrawBuffers.lineStylesBuffer;
590590

591591
descriptorInfosSet0[4u].info.image.imageLayout = IImage::LAYOUT::READ_ONLY_OPTIMAL;
592-
descriptorInfosSet0[4u].info.image.sampler = msdfTextureSampler;
592+
descriptorInfosSet0[4u].info.combinedImageSampler.sampler = msdfTextureSampler;
593593
descriptorInfosSet0[4u].desc = drawResourcesFiller.getMSDFsTextureArray();
594594

595595
// Descriptors For Set 1:
596596
constexpr uint32_t DescriptorCountSet1 = 1u;
597597
video::IGPUDescriptorSet::SDescriptorInfo descriptorInfosSet1[DescriptorCountSet0] = {};
598598
descriptorInfosSet1[0u].info.image.imageLayout = IImage::LAYOUT::GENERAL;
599-
descriptorInfosSet1[0u].info.image.sampler = nullptr;
599+
descriptorInfosSet1[0u].info.combinedImageSampler.sampler = nullptr;
600600
descriptorInfosSet1[0u].desc = pseudoStencilImageView;
601601

602602
constexpr uint32_t DescriptorUpdatesCount = DescriptorCountSet0 + DescriptorCountSet1;

0 commit comments

Comments
 (0)