@AnastaZIuk I need your help for getting the mounting of common/include/nbl/examples under nbl/examples either as dir or builtin archive

Author: devsh

23_Arithmetic2UnitTest/app_resources/testWorkgroup.comp.hlsl

@@ -14,7 +14,8 @@ typedef vector<uint32_t, config_t::ItemsPerInvocation_0> type_t;
 // final (level 1/2) scan needs to fit in one subgroup exactly
 groupshared uint32_t scratch[mpl::max_v<int16_t,config_t::SharedScratchElementCount,1>];
 
-#include "../../common/include/WorkgroupDataAccessors.hlsl"
+#include "nbl/examples/workgroup/DataAccessors.hlsl"
+using namespace nbl::hlsl::examples::workgroup;
 
 static ScratchProxy arithmeticAccessor;
 

29_Arithmetic2Bench/app_resources/benchmarkWorkgroup.comp.hlsl

@@ -15,7 +15,8 @@ typedef vector<uint32_t, config_t::ItemsPerInvocation_0> type_t;
 // final (level 1/2) scan needs to fit in one subgroup exactly
 groupshared uint32_t scratch[mpl::max_v<int16_t,config_t::SharedScratchElementCount,1>];
 
-#include "../../common/include/WorkgroupDataAccessors.hlsl"
+#include "nbl/examples/workgroup/DataAccessors.hlsl"
+using namespace nbl::hlsl::examples::workgroup;
 
 template<uint16_t WorkgroupSizeLog2, uint16_t VirtualWorkgroupSize, uint16_t ItemsPerInvocation>
 struct RandomizedInputDataProxy

29_Arithmetic2Bench/main.cpp

@@ -1,16 +1,16 @@
-#include "SimpleWindowedApplication.hpp"
-#include "CEventCallback.hpp"
-#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
+#include "nbl/examples/examples.hpp"
 #include "app_resources/common.hlsl"
 #include "nbl/builtin/hlsl/workgroup2/arithmetic_config.hlsl"
 #include "nbl/builtin/hlsl/subgroup2/arithmetic_params.hlsl"
 
 using namespace nbl;
-using namespace core;
-using namespace system;
-using namespace asset;
-using namespace ui;
-using namespace video;
+using namespace nbl::core;
+using namespace nbl::system;
+using namespace nbl::asset;
+using namespace nbl::ui;
+using namespace nbl::video;
+using namespace nbl::examples;
+
 
 template<typename SwapchainResources> requires std::is_base_of_v<ISimpleManagedSurface::ISwapchainResources, SwapchainResources>
 class CExplicitSurfaceFormatResizeSurface final : public ISimpleManagedSurface

common/include/WorkgroupDataAccessors.hlsl renamed to common/include/nbl/examples/workgroup/DataAccessors.hlsl

@@ -1,12 +1,18 @@
-#ifndef _WORKGROUP_DATA_ACCESSORS_HLSL_
-#define _WORKGROUP_DATA_ACCESSORS_HLSL_
+#ifndef _NBL_EXAMPLES_WORKGROUP_DATA_ACCESSORS_HLSL_
+#define _NBL_EXAMPLES_WORKGROUP_DATA_ACCESSORS_HLSL_
+
 
 #include "nbl/builtin/hlsl/bda/legacy_bda_accessor.hlsl"
 
+
 namespace nbl
 {
 namespace hlsl
 {
+namespace examples
+{
+namespace workgroup
+{
 
 struct ScratchProxy
 {
@@ -120,5 +126,6 @@ struct PreloadedDataProxy
 
 }
 }
-
+}
+}
 #endif