Skip to content

Commit d6fc699

Browse files
committed
fix example based on master changes
1 parent 5e51e9e commit d6fc699

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

62_CAD/main.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -522,49 +522,49 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
522522
.binding = 0u,
523523
.type = asset::IDescriptor::E_TYPE::ET_UNIFORM_BUFFER,
524524
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
525-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
525+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
526526
.count = 1u,
527527
},
528528
{
529529
.binding = 1u,
530530
.type = asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
531531
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
532-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
532+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
533533
.count = 1u,
534534
},
535535
{
536536
.binding = 2u,
537537
.type = asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
538538
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
539-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
539+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
540540
.count = 1u,
541541
},
542542
{
543543
.binding = 3u,
544544
.type = asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER,
545545
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
546-
.stageFlags = asset::IShader::ESS_VERTEX | asset::IShader::ESS_FRAGMENT,
546+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_VERTEX | asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
547547
.count = 1u,
548548
},
549549
{
550550
.binding = 4u,
551551
.type = asset::IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER,
552552
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
553-
.stageFlags = asset::IShader::ESS_FRAGMENT,
553+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
554554
.count = 1u,
555555
},
556556
{
557557
.binding = 5u,
558558
.type = asset::IDescriptor::E_TYPE::ET_SAMPLER,
559559
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
560-
.stageFlags = asset::IShader::ESS_FRAGMENT,
560+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
561561
.count = 1u,
562562
},
563563
{
564564
.binding = 6u,
565565
.type = asset::IDescriptor::E_TYPE::ET_SAMPLED_IMAGE,
566566
.createFlags = bindlessTextureFlags,
567-
.stageFlags = asset::IShader::ESS_FRAGMENT,
567+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
568568
.count = 128u,
569569
},
570570
};
@@ -577,7 +577,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
577577
.binding = 0u,
578578
.type = asset::IDescriptor::E_TYPE::ET_STORAGE_IMAGE,
579579
.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
580-
.stageFlags = asset::IShader::ESS_FRAGMENT,
580+
.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_FRAGMENT,
581581
.count = 1u,
582582
},
583583
};
@@ -720,10 +720,10 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
720720

721721
return m_device->createShader({ cpuShader.get(), nullptr, nullptr, cache.get() });
722722
};
723-
shaders[0] = loadCompileAndCreateShader(vertexShaderPath, IShader::ESS_VERTEX);
724-
shaders[1] = loadCompileAndCreateShader(fragmentShaderPath, IShader::ESS_FRAGMENT);
725-
shaders[2] = loadCompileAndCreateShader(debugfragmentShaderPath, IShader::ESS_FRAGMENT);
726-
shaders[3] = loadCompileAndCreateShader(resolveAlphasShaderPath, IShader::ESS_FRAGMENT);
723+
shaders[0] = loadCompileAndCreateShader(vertexShaderPath, IShader::E_SHADER_STAGE::ESS_VERTEX);
724+
shaders[1] = loadCompileAndCreateShader(fragmentShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
725+
shaders[2] = loadCompileAndCreateShader(debugfragmentShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
726+
shaders[3] = loadCompileAndCreateShader(resolveAlphasShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
727727

728728
auto serializedCache = cache->serialize();
729729
auto savePath = localOutputCWD / "cache.bin";
@@ -784,10 +784,10 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
784784

785785
return m_device->createShader({ cpuShader.get(), nullptr, cache.get(), nullptr });
786786
};
787-
shaders[0] = loadCompileAndCreateShader(vertexShaderPath, IShader::ESS_VERTEX);
788-
shaders[1] = loadCompileAndCreateShader(fragmentShaderPath, IShader::ESS_FRAGMENT);
789-
shaders[2] = loadCompileAndCreateShader(debugfragmentShaderPath, IShader::ESS_FRAGMENT);
790-
shaders[3] = loadCompileAndCreateShader(resolveAlphasShaderPath, IShader::ESS_FRAGMENT);
787+
shaders[0] = loadCompileAndCreateShader(vertexShaderPath, IShader::E_SHADER_STAGE::ESS_VERTEX);
788+
shaders[1] = loadCompileAndCreateShader(fragmentShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
789+
shaders[2] = loadCompileAndCreateShader(debugfragmentShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
790+
shaders[3] = loadCompileAndCreateShader(resolveAlphasShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
791791
#else
792792

793793
// Load Custom Shader
@@ -809,10 +809,10 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
809809

810810
return m_device->createShader(cpuShader.get());
811811
};
812-
shaders[0] = loadCompileAndCreateShader(vertexShaderPath, IShader::ESS_VERTEX);
813-
shaders[1] = loadCompileAndCreateShader(fragmentShaderPath, IShader::ESS_FRAGMENT);
814-
shaders[2] = loadCompileAndCreateShader(debugfragmentShaderPath, IShader::ESS_FRAGMENT);
815-
shaders[3] = loadCompileAndCreateShader(resolveAlphasShaderPath, IShader::ESS_FRAGMENT);
812+
shaders[0] = loadCompileAndCreateShader(vertexShaderPath, IShader::E_SHADER_STAGE::ESS_VERTEX);
813+
shaders[1] = loadCompileAndCreateShader(fragmentShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
814+
shaders[2] = loadCompileAndCreateShader(debugfragmentShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
815+
shaders[3] = loadCompileAndCreateShader(resolveAlphasShaderPath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
816816
#endif
817817
}
818818

0 commit comments

Comments
 (0)