Skip to content

Commit 7dca3d7

Browse files
devshgraphicsprogrammingdevshgraphicsprogramming
authored
Merge pull request #129 from Devsh-Graphics-Programming/enum_fixups
Fix enum errors
2 parents c6d5ee3 + c522b7e commit 7dca3d7

File tree

10 files changed

+33
-33
lines changed

10 files changed

+33
-33
lines changed

‎02_HelloCompute/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class HelloComputeApp final : public nbl::application_templates::MonoSystemMonoL
149149
.binding=0,
150150
.type=nbl::asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
151151
.createFlags=IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE, // not is not the time for descriptor indexing
152-
.stageFlags=IGPUShader::ESS_COMPUTE,
152+
.stageFlags=IGPUShader::E_SHADER_STAGE::ESS_COMPUTE,
153153
.count=1,
154154
}
155155
};

‎03_DeviceSelectionAndSharedSources/Testers.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class IntrospectionTesterBase
5353
// The Shader Asset Loaders deduce the stage from the file extension,
5454
// if the extension is generic (.glsl or .hlsl) the stage is unknown.
5555
// But it can still be overriden from within the source with a `#pragma shader_stage`
56-
options.stage = source->getStage() == IShader::ESS_COMPUTE ? source->getStage() : IShader::ESS_VERTEX; // TODO: do smth with it
56+
options.stage = source->getStage() == IShader::E_SHADER_STAGE::ESS_COMPUTE ? source->getStage() : IShader::E_SHADER_STAGE::ESS_VERTEX; // TODO: do smth with it
5757
options.targetSpirvVersion = device->getPhysicalDevice()->getLimits().spirvVersion;
5858
// we need to perform an unoptimized compilation with source debug info or we'll lose names of variable sin the introspection
5959
options.spirvOptimizer = nullptr;
@@ -201,7 +201,7 @@ class PredefinedLayoutTester final : public IntrospectionTesterBase
201201
.binding = 0,
202202
.type = nbl::asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
203203
.createFlags = ICPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
204-
.stageFlags = ICPUShader::ESS_COMPUTE,
204+
.stageFlags = ICPUShader::E_SHADER_STAGE::ESS_COMPUTE,
205205
.count = 1,
206206
.immutableSamplers = nullptr
207207
}
@@ -213,15 +213,15 @@ class PredefinedLayoutTester final : public IntrospectionTesterBase
213213
.binding = 0,
214214
.type = nbl::asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
215215
.createFlags = ICPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
216-
.stageFlags = ICPUShader::ESS_COMPUTE,
216+
.stageFlags = ICPUShader::E_SHADER_STAGE::ESS_COMPUTE,
217217
.count = 1,
218218
.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,
224-
.stageFlags = ICPUShader::ESS_COMPUTE,
224+
.stageFlags = ICPUShader::E_SHADER_STAGE::ESS_COMPUTE,
225225
.count = 2,
226226
.immutableSamplers = nullptr
227227
}

‎03_DeviceSelectionAndSharedSources/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class DeviceSelectionAndSharedSourcesApp final : public application_templates::M
8585
binding.binding = introspectionBinding.binding;
8686
binding.type = introspectionBinding.type;
8787
binding.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE;
88-
binding.stageFlags = IGPUShader::ESS_COMPUTE;
88+
binding.stageFlags = IGPUShader::E_SHADER_STAGE::ESS_COMPUTE;
8989
assert(introspectionBinding.count.countMode == CSPIRVIntrospector::CIntrospectionData::SDescriptorArrayInfo::DESCRIPTOR_COUNT::STATIC);
9090
binding.count = introspectionBinding.count.count;
9191
}
@@ -305,7 +305,7 @@ class DeviceSelectionAndSharedSourcesApp final : public application_templates::M
305305
// The Shader Asset Loaders deduce the stage from the file extension,
306306
// if the extension is generic (.glsl or .hlsl) the stage is unknown.
307307
// But it can still be overriden from within the source with a `#pragma shader_stage`
308-
options.stage = source->getStage() == IShader::ESS_COMPUTE ? source->getStage() : IShader::ESS_VERTEX; // TODO: do smth with it
308+
options.stage = source->getStage() == IShader::E_SHADER_STAGE::ESS_COMPUTE ? source->getStage() : IShader::E_SHADER_STAGE::ESS_VERTEX; // TODO: do smth with it
309309
options.targetSpirvVersion = m_device->getPhysicalDevice()->getLimits().spirvVersion;
310310
// we need to perform an unoptimized compilation with source debug info or we'll lose names of variable sin the introspection
311311
options.spirvOptimizer = nullptr;

‎07_StagingAndMultipleQueues/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
313313
smart_refctd_ptr<ICPUShader> source;
314314
{
315315
source = loadFistAssetInBundle<ICPUShader>("../app_resources/comp_shader.hlsl");
316-
source->setShaderStage(IShader::ESS_COMPUTE);
316+
source->setShaderStage(IShader::E_SHADER_STAGE::ESS_COMPUTE);
317317
}
318318

319319
if (!source)

‎10_CountingSort/main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class CountingSortApp final : public application_templates::MonoDeviceApplicatio
8989
}
9090

9191
// People love Reflection but I prefer Shader Sources instead!
92-
const nbl::asset::SPushConstantRange pcRange = { .stageFlags = IShader::ESS_COMPUTE,.offset = 0,.size = sizeof(CountingPushData) };
92+
const nbl::asset::SPushConstantRange pcRange = { .stageFlags = IShader::E_SHADER_STAGE::ESS_COMPUTE,.offset = 0,.size = sizeof(CountingPushData) };
9393

9494
// This time we'll have no Descriptor Sets or Layouts because our workload has a widely varying size
9595
// and using traditional SSBO bindings would force us to update the Descriptor Set every frame.
@@ -229,7 +229,7 @@ class CountingSortApp final : public application_templates::MonoDeviceApplicatio
229229
cmdBuf->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT);
230230
cmdBuf->beginDebugMarker("Prefix Sum Dispatch", core::vectorSIMDf(0, 1, 0, 1));
231231
cmdBuf->bindComputePipeline(prefixSumPipeline.get());
232-
cmdBuf->pushConstants(layout.get(), IShader::ESS_COMPUTE, 0u, sizeof(pc), &pc);
232+
cmdBuf->pushConstants(layout.get(), IShader::E_SHADER_STAGE::ESS_COMPUTE, 0u, sizeof(pc), &pc);
233233
cmdBuf->dispatch(ceil((float)element_count / (elements_per_thread * WorkgroupSize)), 1, 1);
234234
cmdBuf->endDebugMarker();
235235
cmdBuf->end();
@@ -271,7 +271,7 @@ class CountingSortApp final : public application_templates::MonoDeviceApplicatio
271271
cmdBuf->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT);
272272
cmdBuf->beginDebugMarker("Scatter Dispatch", core::vectorSIMDf(0, 1, 0, 1));
273273
cmdBuf->bindComputePipeline(scatterPipeline.get());
274-
cmdBuf->pushConstants(layout.get(), IShader::ESS_COMPUTE, 0u, sizeof(pc), &pc);
274+
cmdBuf->pushConstants(layout.get(), IShader::E_SHADER_STAGE::ESS_COMPUTE, 0u, sizeof(pc), &pc);
275275
cmdBuf->dispatch(ceil((float)element_count / (elements_per_thread * WorkgroupSize)), 1, 1);
276276
cmdBuf->endDebugMarker();
277277
cmdBuf->end();

‎22_CppCompat/main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CompatibilityTest final : public MonoDeviceApplication, public MonoAssetMa
7676
auto source = IAsset::castDown<ICPUShader>(assets[0]);
7777
// The down-cast should not fail!
7878
assert(source);
79-
assert(source->getStage() == IShader::ESS_COMPUTE);
79+
assert(source->getStage() == IShader::E_SHADER_STAGE::ESS_COMPUTE);
8080

8181
// this time we skip the use of the asset converter since the ICPUShader->IGPUShader path is quick and simple
8282
shader = m_device->createShader(source.get());
@@ -93,14 +93,14 @@ class CompatibilityTest final : public MonoDeviceApplication, public MonoAssetMa
9393

9494
for(int i = 0; i < bindingCount; ++i)
9595
{
96-
bindings[i].stageFlags = IShader::ESS_COMPUTE;
96+
bindings[i].stageFlags = IShader::E_SHADER_STAGE::ESS_COMPUTE;
9797
bindings[i].count = 1;
9898
bindings[i].binding = i;
9999
}
100100
m_descriptorSetLayout = m_device->createDescriptorSetLayout(bindings);
101101
{
102102
SPushConstantRange pcRange = {};
103-
pcRange.stageFlags = IShader::ESS_COMPUTE;
103+
pcRange.stageFlags = IShader::E_SHADER_STAGE::ESS_COMPUTE;
104104
pcRange.offset = 0u;
105105
pcRange.size = 2 * sizeof(uint32_t);
106106
auto layout = m_device->createPipelineLayout({ &pcRange,1 }, smart_refctd_ptr(m_descriptorSetLayout));

‎23_ArithmeticUnitTest/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ArithmeticUnitTestApp final : public application_templates::BasicMultiQueu
107107
{
108108
IGPUDescriptorSetLayout::SBinding binding[2];
109109
for (uint32_t i = 0u; i < 2; i++)
110-
binding[i] = { i,IDescriptor::E_TYPE::ET_STORAGE_BUFFER, IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE, IShader::ESS_COMPUTE, 1u, nullptr };
110+
binding[i] = { i,IDescriptor::E_TYPE::ET_STORAGE_BUFFER, IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE, IShader::E_SHADER_STAGE::ESS_COMPUTE, 1u, nullptr };
111111
binding[1].count = OutputBufferCount;
112112
dsLayout = m_device->createDescriptorSetLayout(binding);
113113
}

‎24_ColorSpaceTest/main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication
137137
.binding = 0,
138138
.type = IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER,
139139
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
140-
.stageFlags = IShader::ESS_FRAGMENT,
140+
.stageFlags = IShader::E_SHADER_STAGE::ESS_FRAGMENT,
141141
.count = 1,
142142
.immutableSamplers = &defaultSampler
143143
}
@@ -188,7 +188,7 @@ class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication
188188
// Now create the pipeline
189189
{
190190
const asset::SPushConstantRange range = {
191-
.stageFlags = IShader::ESS_FRAGMENT,
191+
.stageFlags = IShader::E_SHADER_STAGE::ESS_FRAGMENT,
192192
.offset = 0,
193193
.size = sizeof(push_constants_t)
194194
};
@@ -489,7 +489,7 @@ class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication
489489
cmdbuf->beginRenderPass(info,IGPUCommandBuffer::SUBPASS_CONTENTS::INLINE);
490490
}
491491
cmdbuf->bindGraphicsPipeline(m_pipeline.get());
492-
cmdbuf->pushConstants(m_pipeline->getLayout(),IGPUShader::ESS_FRAGMENT,0,sizeof(push_constants_t),&pc);
492+
cmdbuf->pushConstants(m_pipeline->getLayout(),IGPUShader::E_SHADER_STAGE::ESS_FRAGMENT,0,sizeof(push_constants_t),&pc);
493493
cmdbuf->bindDescriptorSets(nbl::asset::EPBP_GRAPHICS,m_pipeline->getLayout(),3,1,&ds);
494494
ext::FullScreenTriangle::recordDrawCall(cmdbuf);
495495
cmdbuf->endRenderPass();

‎35_GeometryCreator/main.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ class GeometryCreatorApp final : public examples::SimpleWindowedApplication
273273

274274
SPushConstantRange pushConstantRanges[] = {
275275
{
276-
.stageFlags = IShader::ESS_VERTEX,
276+
.stageFlags = IShader::E_SHADER_STAGE::ESS_VERTEX,
277277
.offset = 0,
278278
.size = sizeof(PushConstants)
279279
}
@@ -284,7 +284,7 @@ class GeometryCreatorApp final : public examples::SimpleWindowedApplication
284284
.binding = 0u,
285285
.type = asset::IDescriptor::E_TYPE::ET_UNIFORM_BUFFER,
286286
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
287-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
287+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
288288
.count = 1u,
289289
}
290290
};
@@ -524,7 +524,7 @@ class GeometryCreatorApp final : public examples::SimpleWindowedApplication
524524
auto* rawPipeline = hook.pipeline.get();
525525
cb->bindGraphicsPipeline(rawPipeline);
526526
cb->bindDescriptorSets(EPBP_GRAPHICS, rawPipeline->getLayout(), 1, 1, &m_gpuDescriptorSet.get());
527-
cb->pushConstants(rawPipeline->getLayout(), IShader::ESS_VERTEX, 0, sizeof(PushConstants), &m_pc);
527+
cb->pushConstants(rawPipeline->getLayout(), IShader::E_SHADER_STAGE::ESS_VERTEX, 0, sizeof(PushConstants), &m_pc);
528528

529529
const asset::SBufferBinding<const IGPUBuffer> bVertices[] = { {.offset = 0, .buffer = hook.m_vertexBuffer} };
530530
const asset::SBufferBinding<const IGPUBuffer> bIndices = { .offset = 0, .buffer = hook.m_indexBuffer };
@@ -681,8 +681,8 @@ class GeometryCreatorApp final : public examples::SimpleWindowedApplication
681681
return m_device->createShader(shader.get());
682682
};
683683

684-
shaders.vertex = createShader(spirv.vertex, IShader::ESS_VERTEX);
685-
shaders.fragment = createShader(spirv.fragment, IShader::ESS_FRAGMENT);
684+
shaders.vertex = createShader(spirv.vertex, IShader::E_SHADER_STAGE::ESS_VERTEX);
685+
shaders.fragment = createShader(spirv.fragment, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
686686
}
687687

688688
SBlendParams blendParams{};

‎62_CAD/main.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -506,35 +506,35 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
506506
.binding = 0u,
507507
.type = asset::IDescriptor::E_TYPE::ET_UNIFORM_BUFFER,
508508
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
509-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
509+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
510510
.count = 1u,
511511
},
512512
{
513513
.binding = 1u,
514514
.type = asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
515515
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
516-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
516+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
517517
.count = 1u,
518518
},
519519
{
520520
.binding = 2u,
521521
.type = asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
522522
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
523-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
523+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
524524
.count = 1u,
525525
},
526526
{
527527
.binding = 3u,
528528
.type = asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
529529
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
530-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
530+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
531531
.count = 1u,
532532
},
533533
{
534534
.binding = 4u,
535535
.type = asset::IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER,
536536
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
537-
.stageFlags = asset::IShader::ESS_FRAGMENT,
537+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
538538
.count = 1u,
539539
},
540540
};
@@ -547,7 +547,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
547547
.binding = 0u,
548548
.type = asset::IDescriptor::E_TYPE::ET_STORAGE_IMAGE,
549549
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
550-
.stageFlags = asset::IShader::ESS_FRAGMENT,
550+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
551551
.count = 1u,
552552
},
553553
};
@@ -767,10 +767,10 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
767767

768768
return m_device->createShader(cpuShader.get());
769769
};
770-
shaders[0] = loadCompileAndCreateShader(vertexShaderPath, IShader::ESS_VERTEX);
771-
shaders[1] = loadCompileAndCreateShader(fragmentShaderPath, IShader::ESS_FRAGMENT);
772-
shaders[2] = loadCompileAndCreateShader(debugfragmentShaderPath, IShader::ESS_FRAGMENT);
773-
shaders[3] = loadCompileAndCreateShader(resolveAlphasShaderPath, IShader::ESS_FRAGMENT);
770+
shaders[0] = loadCompileAndCreateShader(vertexShaderPath, IShader::E_SHADER_STAGE::ESS_VERTEX);
771+
shaders[1] = loadCompileAndCreateShader(fragmentShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
772+
shaders[2] = loadCompileAndCreateShader(debugfragmentShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
773+
shaders[3] = loadCompileAndCreateShader(resolveAlphasShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
774774
#endif
775775
}
776776

0 commit comments

Comments
 (0)