Skip to content

Commit 6796fa6

Browse files
author
devsh
committed
move acccessor concepts to their own folder and namespace
1 parent 9a233c7 commit 6796fa6

File tree

5 files changed

+24
-12
lines changed

5 files changed

+24
-12
lines changed

include/nbl/builtin/hlsl/concepts/anisotropically_sampled.hlsl renamed to include/nbl/builtin/hlsl/concepts/accessors/anisotropically_sampled.hlsl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (C) 2024-2025 - 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-
#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ANISOTROPICALLY_SAMPLED_INCLUDED_
5-
#define _NBL_BUILTIN_HLSL_CONCEPTS_ANISOTROPICALLY_SAMPLED_INCLUDED_
4+
#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_ANISOTROPICALLY_SAMPLED_INCLUDED_
5+
#define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_ANISOTROPICALLY_SAMPLED_INCLUDED_
66

77

88
#include <nbl/builtin/hlsl/concepts.hlsl>
@@ -14,6 +14,8 @@ namespace hlsl
1414
{
1515
namespace concepts
1616
{
17+
namespace accessors
18+
{
1719
// declare concept
1820
#define NBL_CONCEPT_NAME AnisotropicallySampled
1921
#define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(int32_t)
@@ -44,4 +46,5 @@ NBL_CONCEPT_END(
4446
}
4547
}
4648
}
49+
}
4750
#endif

include/nbl/builtin/hlsl/concepts/loadable_image.hlsl renamed to include/nbl/builtin/hlsl/concepts/accessors/loadable_image.hlsl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (C) 2024-2025 - 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-
#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_LOADABLE_IMAGE_INCLUDED_
5-
#define _NBL_BUILTIN_HLSL_CONCEPTS_LOADABLE_IMAGE_INCLUDED_
4+
#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_LOADABLE_IMAGE_INCLUDED_
5+
#define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_LOADABLE_IMAGE_INCLUDED_
66

77

88
#include <nbl/builtin/hlsl/concepts.hlsl>
@@ -14,6 +14,8 @@ namespace hlsl
1414
{
1515
namespace concepts
1616
{
17+
namespace accessors
18+
{
1719
// declare concept
1820
#define NBL_CONCEPT_NAME StorableImage
1921
#define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(typename)(int32_t)
@@ -63,4 +65,5 @@ NBL_CONCEPT_END(
6365
}
6466
}
6567
}
68+
}
6669
#endif

include/nbl/builtin/hlsl/concepts/mip_mapped.hlsl renamed to include/nbl/builtin/hlsl/concepts/accessors/mip_mapped.hlsl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (C) 2024-2025 - 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-
#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_MIP_MAPPED_INCLUDED_
5-
#define _NBL_BUILTIN_HLSL_CONCEPTS_MIP_MAPPED_INCLUDED_
4+
#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_MIP_MAPPED_INCLUDED_
5+
#define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_MIP_MAPPED_INCLUDED_
66

77

88
#include <nbl/builtin/hlsl/concepts.hlsl>
@@ -14,6 +14,8 @@ namespace hlsl
1414
{
1515
namespace concepts
1616
{
17+
namespace accessors
18+
{
1719
// declare concept
1820
#define NBL_CONCEPT_NAME MipMapped
1921
#define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(int32_t)
@@ -41,4 +43,5 @@ NBL_CONCEPT_END(
4143
}
4244
}
4345
}
46+
}
4447
#endif

include/nbl/builtin/hlsl/concepts/storable_image.hlsl renamed to include/nbl/builtin/hlsl/concepts/accessors/storable_image.hlsl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (C) 2024-2025 - 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-
#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_STORABLE_IMAGE_INCLUDED_
5-
#define _NBL_BUILTIN_HLSL_CONCEPTS_STORABLE_IMAGE_INCLUDED_
4+
#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_STORABLE_IMAGE_INCLUDED_
5+
#define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_STORABLE_IMAGE_INCLUDED_
66

77

88
#include <nbl/builtin/hlsl/concepts.hlsl>
@@ -14,6 +14,8 @@ namespace hlsl
1414
{
1515
namespace concepts
1616
{
17+
namespace accessors
18+
{
1719
// declare concept
1820
#define NBL_CONCEPT_NAME StorableImage
1921
#define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(typename)(int32_t)
@@ -41,4 +43,5 @@ NBL_CONCEPT_END(
4143
}
4244
}
4345
}
46+
}
4447
#endif

src/nbl/builtin/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/enums.hlsl")
325325
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/binding_info.hlsl")
326326
#
327327
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/__end.hlsl")
328-
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/anisotropically_sampled.hlsl")
329-
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/loadable_image.hlsl")
330-
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/mip_mapped.hlsl")
331-
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/storable_image.hlsl")
328+
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/accessors/anisotropically_sampled.hlsl")
329+
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/accessors/loadable_image.hlsl")
330+
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/accessors/mip_mapped.hlsl")
331+
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/accessors/storable_image.hlsl")
332332

333333
ADD_CUSTOM_BUILTIN_RESOURCES(nblBuiltinResourceData NBL_RESOURCES_TO_EMBED "${NBL_ROOT_PATH}/include" "nbl/builtin" "nbl::builtin" "${NBL_ROOT_PATH_BINARY}/include" "${NBL_ROOT_PATH_BINARY}/src" "STATIC" "INTERNAL")

0 commit comments

Comments
 (0)