move acccessor concepts to their own folder and namespace

devsh · devsh · commit 6796fa60f7ad · 2024-11-12T16:22:13.000+01:00
diff --git a/include/nbl/builtin/hlsl/concepts/accessors/anisotropically_sampled.hlsl b/include/nbl/builtin/hlsl/concepts/accessors/anisotropically_sampled.hlsl
@@ -1,8 +1,8 @@
 // Copyright (C) 2024-2025 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ANISOTROPICALLY_SAMPLED_INCLUDED_
-#define _NBL_BUILTIN_HLSL_CONCEPTS_ANISOTROPICALLY_SAMPLED_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_ANISOTROPICALLY_SAMPLED_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_ANISOTROPICALLY_SAMPLED_INCLUDED_
 
 
 #include <nbl/builtin/hlsl/concepts.hlsl>
@@ -14,6 +14,8 @@ namespace hlsl
 {
 namespace concepts
 {
+namespace accessors
+{
 // declare concept
 #define NBL_CONCEPT_NAME AnisotropicallySampled
 #define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(int32_t)
@@ -44,4 +46,5 @@ NBL_CONCEPT_END(
 }
 }
 }
+}
 #endif
diff --git a/include/nbl/builtin/hlsl/concepts/accessors/loadable_image.hlsl b/include/nbl/builtin/hlsl/concepts/accessors/loadable_image.hlsl
@@ -1,8 +1,8 @@
 // Copyright (C) 2024-2025 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_LOADABLE_IMAGE_INCLUDED_
-#define _NBL_BUILTIN_HLSL_CONCEPTS_LOADABLE_IMAGE_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_LOADABLE_IMAGE_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_LOADABLE_IMAGE_INCLUDED_
 
 
 #include <nbl/builtin/hlsl/concepts.hlsl>
@@ -14,6 +14,8 @@ namespace hlsl
 {
 namespace concepts
 {
+namespace accessors
+{
 // declare concept
 #define NBL_CONCEPT_NAME StorableImage
 #define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(typename)(int32_t)
@@ -63,4 +65,5 @@ NBL_CONCEPT_END(
 }
 }
 }
+}
 #endif
diff --git a/include/nbl/builtin/hlsl/concepts/accessors/mip_mapped.hlsl b/include/nbl/builtin/hlsl/concepts/accessors/mip_mapped.hlsl
@@ -1,8 +1,8 @@
 // Copyright (C) 2024-2025 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_MIP_MAPPED_INCLUDED_
-#define _NBL_BUILTIN_HLSL_CONCEPTS_MIP_MAPPED_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_MIP_MAPPED_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_MIP_MAPPED_INCLUDED_
 
 
 #include <nbl/builtin/hlsl/concepts.hlsl>
@@ -14,6 +14,8 @@ namespace hlsl
 {
 namespace concepts
 {
+namespace accessors
+{
 // declare concept
 #define NBL_CONCEPT_NAME MipMapped
 #define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(int32_t)
@@ -41,4 +43,5 @@ NBL_CONCEPT_END(
 }
 }
 }
+}
 #endif
diff --git a/include/nbl/builtin/hlsl/concepts/accessors/storable_image.hlsl b/include/nbl/builtin/hlsl/concepts/accessors/storable_image.hlsl
@@ -1,8 +1,8 @@
 // Copyright (C) 2024-2025 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_STORABLE_IMAGE_INCLUDED_
-#define _NBL_BUILTIN_HLSL_CONCEPTS_STORABLE_IMAGE_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_STORABLE_IMAGE_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_STORABLE_IMAGE_INCLUDED_
 
 
 #include <nbl/builtin/hlsl/concepts.hlsl>
@@ -14,6 +14,8 @@ namespace hlsl
 {
 namespace concepts
 {
+namespace accessors
+{
 // declare concept
 #define NBL_CONCEPT_NAME StorableImage
 #define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(typename)(int32_t)
@@ -41,4 +43,5 @@ NBL_CONCEPT_END(
 }
 }
 }
+}
 #endif
diff --git a/src/nbl/builtin/CMakeLists.txt b/src/nbl/builtin/CMakeLists.txt
@@ -325,9 +325,9 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/enums.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/binding_info.hlsl")
 #
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/__end.hlsl")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/anisotropically_sampled.hlsl")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/loadable_image.hlsl")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/mip_mapped.hlsl")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/storable_image.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/accessors/anisotropically_sampled.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/accessors/loadable_image.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/accessors/mip_mapped.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/accessors/storable_image.hlsl")
 
 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")

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`// Copyright (C) 2024-2025 - DevSH Graphics Programming Sp. z O.O.`
`2`	`2`	`// This file is part of the "Nabla Engine".`
`3`	`3`	`// 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_`
`6`	`6`
`7`	`7`
`8`	`8`	`#include <nbl/builtin/hlsl/concepts.hlsl>`
`@@ -14,6 +14,8 @@ namespace hlsl`
`14`	`14`	`{`
`15`	`15`	`namespace concepts`
`16`	`16`	`{`
	`17`	`+namespace accessors`
	`18`	`+{`
`17`	`19`	`// declare concept`
`18`	`20`	`#define NBL_CONCEPT_NAME AnisotropicallySampled`
`19`	`21`	`#define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(int32_t)`
`@@ -44,4 +46,5 @@ NBL_CONCEPT_END(`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`	`}`
	`49`	`+}`
`47`	`50`	`#endif`