Skip to content

Commit ce268fb

Browse files
author
devsh
committed
Adjust all examples after splitting MonoAssetManagerAndBuiltinResourceApplication in two
1 parent f494d85 commit ce268fb

File tree

24 files changed

+219
-119
lines changed

24 files changed

+219
-119
lines changed

‎03_DeviceSelectionAndSharedSources/Testers.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
#ifndef _NBL_TESTERS_H_INCLUDED_
55
#define _NBL_TESTERS_H_INCLUDED_
66

7-
#include "nbl/application_templates/MonoDeviceApplication.hpp"
8-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
7+
#include "nbl/examples/examples.hpp"
98

109
using namespace nbl;
1110

‎03_DeviceSelectionAndSharedSources/main.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
44

5+
56
#include "nbl/examples/examples.hpp"
67
// TODO: why isn't this in `nabla.h` ?
78
#include "nbl/asset/metadata/CHLSLMetadata.h"
89

10+
911
using namespace nbl;
10-
using namespace core;
11-
using namespace system;
12-
using namespace asset;
13-
using namespace video;
12+
using namespace nbl::core;
13+
using namespace nbl::hlsl;
14+
using namespace nbl::system;
15+
using namespace nbl::asset;
16+
using namespace nbl::ui;
17+
using namespace nbl::video;
18+
using namespace nbl::examples;
1419

1520
// TODO[Przemek]: update comments
1621

@@ -21,10 +26,10 @@ using namespace video;
2126
constexpr bool ENABLE_TESTS = false;
2227

2328
// This time we create the device in the base class and also use a base class to give us an Asset Manager and an already mounted built-in resource archive
24-
class DeviceSelectionAndSharedSourcesApp final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
29+
class DeviceSelectionAndSharedSourcesApp final : public application_templates::MonoDeviceApplication, public BuiltinResourcesApplication
2530
{
2631
using device_base_t = application_templates::MonoDeviceApplication;
27-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
32+
using asset_base_t = BuiltinResourcesApplication;
2833
public:
2934
// Yay thanks to multiple inheritance we cannot forward ctors anymore
3035
DeviceSelectionAndSharedSourcesApp(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD) :

‎05_StreamingAndBufferDeviceAddressApp/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
77
#include "nbl/application_templates/MonoDeviceApplication.hpp"
8-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
8+
#include "nbl/examples/common/BuiltinResourcesApplication.hpp"
99

1010

1111
using namespace nbl;
@@ -20,10 +20,10 @@ using namespace video;
2020

2121

2222
// In this application we'll cover buffer streaming, Buffer Device Address (BDA) and push constants
23-
class StreamingAndBufferDeviceAddressApp final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
23+
class StreamingAndBufferDeviceAddressApp final : public application_templates::MonoDeviceApplication, public examples::BuiltinResourcesApplication
2424
{
2525
using device_base_t = application_templates::MonoDeviceApplication;
26-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
26+
using asset_base_t = examples::BuiltinResourcesApplication;
2727

2828
// This is the first example that submits multiple workloads in-flight.
2929
// What the shader does is it computes the minimum distance of each point against K other random input points.

‎06_HelloGraphicsQueue/main.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@
33
// For conditions of distribution and use, see copyright notice in nabla.h
44

55

6-
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
7-
#include "nbl/application_templates/MonoDeviceApplication.hpp"
8-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
6+
#include "nbl/examples/examples.hpp"
97

108
#include "nbl/ext/ScreenShot/ScreenShot.h"
119

1210

1311
using namespace nbl;
14-
using namespace core;
15-
using namespace system;
16-
using namespace asset;
17-
using namespace video;
12+
using namespace nbl::core;
13+
using namespace nbl::hlsl;
14+
using namespace nbl::system;
15+
using namespace nbl::asset;
16+
using namespace nbl::ui;
17+
using namespace nbl::video;
18+
using namespace nbl::examples;
19+
1820

1921
// Here we showcase the use of Graphics Queue only
2022
// Steps we take in this example:
@@ -26,10 +28,10 @@ using namespace video;
2628
// - save the smallImg to disk
2729
//
2830
// all without using IUtilities.
29-
class HelloGraphicsQueueApp final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
31+
class HelloGraphicsQueueApp final : public application_templates::MonoDeviceApplication, public BuiltinResourcesApplication
3032
{
3133
using device_base_t = application_templates::MonoDeviceApplication;
32-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
34+
using asset_base_t = BuiltinResourcesApplication;
3335

3436
public:
3537
// Yay thanks to multiple inheritance we cannot forward ctors anymore.

‎07_StagingAndMultipleQueues/main.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@
66
#include "nbl/examples/examples.hpp"
77

88
using namespace nbl;
9-
using namespace core;
10-
using namespace system;
11-
using namespace asset;
12-
using namespace video;
9+
using namespace nbl::core;
10+
using namespace nbl::hlsl;
11+
using namespace nbl::system;
12+
using namespace nbl::asset;
13+
using namespace nbl::ui;
14+
using namespace nbl::video;
15+
using namespace nbl::examples;
1316

1417
#include "app_resources/common.hlsl"
1518

1619
// This time we let the new base class score and pick queue families, as well as initialize `nbl::video::IUtilities` for us
17-
class StagingAndMultipleQueuesApp final : public application_templates::BasicMultiQueueApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
20+
class StagingAndMultipleQueuesApp final : public application_templates::BasicMultiQueueApplication, public BuiltinResourcesApplication
1821
{
1922
using device_base_t = application_templates::BasicMultiQueueApplication;
20-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
23+
using asset_base_t = BuiltinResourcesApplication;
2124

2225
// TODO: would be cool if we used `system::ISystem::listItemsInDirectory(sharedInputCWD/"GLI")` as our dataset
2326
static constexpr std::array imagesToLoad = {

‎09_GeometryCreator/main.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
44

5+
56
#include "common.hpp"
67

7-
// TODO: Arek, we should have a `nbl::examples` class inheriting from `application_templates::MonoAssetManagerAndBuiltinResourceApplication` which
8-
// during `onAppInitialized` also mounts correct `common/include/nbl/examples` and `common/src/nbl/examples` as folder or builtin
9-
class GeometryCreatorApp final : public MonoWindowApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
8+
9+
class GeometryCreatorApp final : public MonoWindowApplication, public BuiltinResourcesApplication
1010
{
1111
using device_base_t = MonoWindowApplication;
12-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
12+
using asset_base_t = BuiltinResourcesApplication;
1313

1414
public:
1515
GeometryCreatorApp(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD)
@@ -58,10 +58,6 @@ class GeometryCreatorApp final : public MonoWindowApplication, public applicatio
5858
.addtionalBufferOwnershipFamilies = addtionalBufferOwnershipFamilies
5959
},patch
6060
);
61-
62-
// TODO: this is plain wrong Arek
63-
m_system->mount(make_smart_refctd_ptr<system::CMountDirectoryArchive>(localInputCWD/"../common/include/nbl/examples",smart_refctd_ptr(m_logger),m_system.get()),"nbl/examples");
64-
m_system->mount(make_smart_refctd_ptr<system::CMountDirectoryArchive>(localInputCWD/"../common/src/nbl/examples",smart_refctd_ptr(m_logger),m_system.get()),"nbl/examples");
6561

6662
auto scRes = static_cast<CDefaultSwapchainFramebuffers*>(m_surface->getSwapchainResources());
6763
m_renderer = CSimpleDebugRenderer::create(m_assetMgr.get(),scRes->getRenderpass(),0,m_scene.get());

‎10_CountingSort/main.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
#include "nbl/examples/examples.hpp"
22

33
using namespace nbl;
4-
using namespace core;
5-
using namespace system;
6-
using namespace asset;
7-
using namespace video;
4+
using namespace nbl::core;
5+
using namespace nbl::hlsl;
6+
using namespace nbl::system;
7+
using namespace nbl::asset;
8+
using namespace nbl::ui;
9+
using namespace nbl::video;
10+
using namespace nbl::examples;
811

912
#include "app_resources/common.hlsl"
1013
#include "nbl/builtin/hlsl/bit.hlsl"
1114

12-
class CountingSortApp final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
15+
class CountingSortApp final : public application_templates::MonoDeviceApplication, public BuiltinResourcesApplication
1316
{
1417
using device_base_t = application_templates::MonoDeviceApplication;
15-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
18+
using asset_base_t = BuiltinResourcesApplication;
1619

1720
public:
1821
// Yay thanks to multiple inheritance we cannot forward ctors anymore

‎11_FFT/main.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,27 @@
33
// For conditions of distribution and use, see copyright notice in nabla.h
44

55

6-
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
7-
#include "nbl/application_templates/MonoDeviceApplication.hpp"
8-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
9-
6+
#include "nbl/examples/examples.hpp"
107

118
using namespace nbl;
12-
using namespace core;
13-
using namespace system;
14-
using namespace asset;
15-
using namespace video;
16-
9+
using namespace nbl::core;
10+
using namespace nbl::hlsl;
11+
using namespace nbl::system;
12+
using namespace nbl::asset;
13+
using namespace nbl::ui;
14+
using namespace nbl::video;
15+
using namespace nbl::examples;
1716

1817
#include "app_resources/common.hlsl"
1918
#include "nbl/builtin/hlsl/bit.hlsl"
2019
#include "nbl/builtin/hlsl/random/xoroshiro.hlsl"
2120

2221

2322
// Simple showcase of how to run FFT on a 1D array
24-
class FFT_Test final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
23+
class FFT_Test final : public application_templates::MonoDeviceApplication, public BuiltinResourcesApplication
2524
{
2625
using device_base_t = application_templates::MonoDeviceApplication;
27-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
26+
using asset_base_t = BuiltinResourcesApplication;
2827

2928
smart_refctd_ptr<IGPUComputePipeline> m_pipeline;
3029

‎22_CppCompat/CIntrinsicsTester.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#ifndef _NBL_EXAMPLES_TESTS_22_CPP_COMPAT_C_INTRINSICS_TESTER_INCLUDED_
22
#define _NBL_EXAMPLES_TESTS_22_CPP_COMPAT_C_INTRINSICS_TESTER_INCLUDED_
33

4-
#include <nabla.h>
4+
5+
#include "nbl/examples/examples.hpp"
6+
57
#include "app_resources/common.hlsl"
6-
#include "nbl/application_templates/MonoDeviceApplication.hpp"
7-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
88
#include "ITester.h"
99

10+
1011
using namespace nbl;
1112

1213
class CIntrinsicsTester final : public ITester

‎22_CppCompat/CTgmathTester.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#ifndef _NBL_EXAMPLES_TESTS_22_CPP_COMPAT_C_TGMATH_TESTER_INCLUDED_
22
#define _NBL_EXAMPLES_TESTS_22_CPP_COMPAT_C_TGMATH_TESTER_INCLUDED_
33

4-
#include <nabla.h>
4+
5+
#include "nbl/examples/examples.hpp"
6+
57
#include "app_resources/common.hlsl"
6-
#include "nbl/application_templates/MonoDeviceApplication.hpp"
7-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
88
#include "ITester.h"
99

10+
1011
using namespace nbl;
1112

1213
class CTgmathTester final : public ITester

‎22_CppCompat/ITester.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#ifndef _NBL_EXAMPLES_TESTS_22_CPP_COMPAT_I_TESTER_INCLUDED_
22
#define _NBL_EXAMPLES_TESTS_22_CPP_COMPAT_I_TESTER_INCLUDED_
33

4-
#include <nabla.h>
4+
5+
#include "nbl/examples/examples.hpp"
6+
57
#include "app_resources/common.hlsl"
6-
#include "nbl/application_templates/MonoDeviceApplication.hpp"
7-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
88
#include "nbl/asset/metadata/CHLSLMetadata.h"
99

10+
1011
using namespace nbl;
1112

1213
class ITester

‎22_CppCompat/main.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
// Copyright (C) 2018-2024 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4-
#include <nabla.h>
5-
#include <iostream>
6-
#include <cstdio>
7-
#include <assert.h>
84

9-
#include "nbl/application_templates/MonoDeviceApplication.hpp"
10-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
115

126
#include "app_resources/common.hlsl"
137

148
#include "CTgmathTester.h"
159
#include "CIntrinsicsTester.h"
1610

11+
#include <iostream>
12+
#include <cstdio>
13+
#include <assert.h>
14+
15+
16+
using namespace nbl;
1717
using namespace nbl::core;
1818
using namespace nbl::hlsl;
1919
using namespace nbl::system;
2020
using namespace nbl::asset;
21+
using namespace nbl::ui;
2122
using namespace nbl::video;
22-
using namespace nbl::application_templates;
23-
23+
using namespace nbl::examples;
2424

2525
//using namespace glm;
2626

@@ -43,10 +43,10 @@ struct T
4343
float32_t4 h;
4444
};
4545

46-
class CompatibilityTest final : public MonoDeviceApplication, public MonoAssetManagerAndBuiltinResourceApplication
46+
class CompatibilityTest final : public application_templates::MonoDeviceApplication, public BuiltinResourcesApplication
4747
{
48-
using device_base_t = MonoDeviceApplication;
49-
using asset_base_t = MonoAssetManagerAndBuiltinResourceApplication;
48+
using device_base_t = application_templates::MonoDeviceApplication;
49+
using asset_base_t = BuiltinResourcesApplication;
5050
public:
5151
CompatibilityTest(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD) :
5252
IApplicationFramework(_localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD) {}

‎23_Arithmetic2UnitTest/main.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
#include "nbl/application_templates/BasicMultiQueueApplication.hpp"
2-
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
1+
// TODO: copyright notice
2+
3+
4+
#include "nbl/examples/examples.hpp"
5+
36
#include "app_resources/common.hlsl"
47
#include "nbl/builtin/hlsl/workgroup2/arithmetic_config.hlsl"
58
#include "nbl/builtin/hlsl/subgroup2/arithmetic_params.hlsl"
69

10+
711
using namespace nbl;
812
using namespace core;
913
using namespace asset;
@@ -47,10 +51,10 @@ struct emulatedScanExclusive
4751
static inline constexpr const char* name = "exclusive_scan";
4852
};
4953

50-
class Workgroup2ScanTestApp final : public application_templates::BasicMultiQueueApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
54+
class Workgroup2ScanTestApp final : public application_templates::BasicMultiQueueApplication, public examples::BuiltinResourcesApplication
5155
{
5256
using device_base_t = application_templates::BasicMultiQueueApplication;
53-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
57+
using asset_base_t = examples::BuiltinResourcesApplication;
5458

5559
public:
5660
Workgroup2ScanTestApp(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD) :

‎24_ColorSpaceTest/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ using namespace nbl::examples;
2222
// defines for sampler tests can be found in the file below
2323
#include "app_resources/push_constants.hlsl"
2424

25-
class ColorSpaceTestSampleApp final : public SimpleWindowedApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
25+
class ColorSpaceTestSampleApp final : public SimpleWindowedApplication, public BuiltinResourcesApplication
2626
{
2727
using device_base_t = SimpleWindowedApplication;
28-
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
28+
using asset_base_t = BuiltinResourcesApplication;
2929
using clock_t = std::chrono::steady_clock;
3030
using perf_clock_resolution_t = std::chrono::milliseconds;
3131

0 commit comments

Comments
 (0)