Skip to content

Commit 82e0727

Browse files
author
kevyuu
committed
Comment out some flags and add some documentation on pipeline flags.
1 parent 3a18b05 commit 82e0727

File tree

4 files changed

+29
-46
lines changed

4 files changed

+29
-46
lines changed

‎include/nbl/asset/IPipeline.h

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,45 +54,57 @@ class IPipeline
5454
// Compute Pipelines only
5555
//DISPATCH_BASE = 1<<4,
5656

57-
// Weird extension
57+
// This is for NV-raytracing extension. Now this is done via IDeferredOperation
5858
//DEFER_COMPILE_NV = 1<<5,
5959

60-
CAPTURE_STATISTICS = 1<<6,
61-
CAPTURE_INTERNAL_REPRESENTATIONS = 1<<7,
60+
// We use Renderdoc to take care of this for us,
61+
// we won't be parsing the statistics and internal representation ourselves.
62+
//CAPTURE_STATISTICS = 1<<6,
63+
//CAPTURE_INTERNAL_REPRESENTATIONS = 1<<7,
6264

63-
// We require Pipeline Cache Control feature so those are satisfied:
64-
// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkComputePipelineCreateInfo.html#VUID-VkComputePipelineCreateInfo-pipelineCreationCacheControl-02875
65+
// Will soon be deprecated due to
66+
// https://github.com/Devsh-Graphics-Programming/Nabla/issues/854
6567
FAIL_ON_PIPELINE_COMPILE_REQUIRED = 1<<8,
6668
EARLY_RETURN_ON_FAILURE = 1<<9,
6769

68-
LINK_TIME_OPTIMIZATION = 1<<10,
70+
// Will be exposed later with the IPipelineLibrary asset implementation
71+
// https://github.com/Devsh-Graphics-Programming/Nabla/issues/853
72+
//LINK_TIME_OPTIMIZATION = 1<<10,
6973

70-
//Not Supported Yet
74+
// Won't be exposed because we'll introduce Libraries as a separate object/asset-type
75+
// https://github.com/Devsh-Graphics-Programming/Nabla/issues/853
7176
//CREATE_LIBRARY = 1<<11,
7277

7378
// Ray Tracing Pipelines only
74-
SKIP_TRIANGLES = 1<<12,
75-
SKIP_AABBS = 1<<13,
76-
//RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR = 1<<14,
77-
//RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR = 1<<15,
78-
//RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR = 1<<16,
79-
//RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR = 1<<17,
80-
81-
// Not Supported Yet
79+
//SKIP_BUILT_IN_PRIMITIVES = 1<<12,
80+
//SKIP_AABBS = 1<<13,
81+
//NO_NULL_ANY_HIT_SHADERS = 1<<14,
82+
//NO_NULL_CLOSEST_HIT_SHADERS = 1<<15,
83+
//NO_NULL_MISS_SHADERS = 1<<16,
84+
//NO_NULL_INTERSECTION_SHADERS = 1<<17,
85+
86+
// There is a new Device Generated Commands extension with its own flag that will deprecate this
8287
//INDIRECT_BINDABLE_NV = 1<<18,
8388

8489
// Ray Tracing Pipelines only
90+
// For debug tools
8591
//RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR = 1<<19,
86-
//RAY_TRACING_ALLOW_MOTION_BIT_NV = 1<<20,
92+
93+
// Ray Tracing Pipelines only
94+
//ALLOW_MOTION = 1<<20,
8795

8896
// Graphics Pipelineonly (we don't support subpass shading)
8997
//RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 1<<21,
9098
//RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 1<<22,
9199

92-
RETAIN_LINK_TIME_OPTIMIZATION_INFO = 1<<23,
100+
// Will be exposed later with the IPipelineLibrary asset implementation
101+
// https://github.com/Devsh-Graphics-Programming/Nabla/issues/853
102+
//RETAIN_LINK_TIME_OPTIMIZATION_INFO = 1<<23,
93103

94104
// Ray Tracing Pipelines only
95105
//RAY_TRACING_OPACITY_MICROMAP_BIT_EXT = 1<<24,
106+
107+
// Not supported yet, and we will move to dynamic rendering, so this might never be supported
96108
//COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT = 1<<25,
97109
//DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT = 1<<26,
98110

‎include/nbl/video/IGPUComputePipeline.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@ class IGPUComputePipeline : public IBackendObject, public asset::IPipeline<const
3535
DISABLE_OPTIMIZATIONS = base_flag(DISABLE_OPTIMIZATIONS),
3636
ALLOW_DERIVATIVES = base_flag(ALLOW_DERIVATIVES),
3737
DISPATCH_BASE = 1<<4,
38-
CAPTURE_STATISTICS = base_flag(CAPTURE_STATISTICS),
39-
CAPTURE_INTERNAL_REPRESENTATIONS = base_flag(CAPTURE_INTERNAL_REPRESENTATIONS),
4038
FAIL_ON_PIPELINE_COMPILE_REQUIRED = base_flag(FAIL_ON_PIPELINE_COMPILE_REQUIRED),
4139
EARLY_RETURN_ON_FAILURE = base_flag(EARLY_RETURN_ON_FAILURE),
42-
LINK_TIME_OPTIMIZATION = base_flag(LINK_TIME_OPTIMIZATION),
43-
RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT = base_flag(RETAIN_LINK_TIME_OPTIMIZATION_INFO),
4440
// Not Supported Yet
4541
//CREATE_LIBRARY = base_flag(CREATE_LIBRARY),
4642
// Not Supported Yet

‎include/nbl/video/IGPUGraphicsPipeline.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ class IGPUGraphicsPipeline : public IBackendObject, public asset::IGraphicsPipel
2727
DISABLE_OPTIMIZATIONS = base_flag(DISABLE_OPTIMIZATIONS),
2828
ALLOW_DERIVATIVES = base_flag(ALLOW_DERIVATIVES),
2929
VIEW_INDEX_FROM_DEVICE_INDEX = 1<<3,
30-
CAPTURE_STATISTICS = base_flag(CAPTURE_STATISTICS),
31-
CAPTURE_INTERNAL_REPRESENTATIONS = base_flag(CAPTURE_INTERNAL_REPRESENTATIONS),
3230
FAIL_ON_PIPELINE_COMPILE_REQUIRED = base_flag(FAIL_ON_PIPELINE_COMPILE_REQUIRED),
3331
EARLY_RETURN_ON_FAILURE = base_flag(EARLY_RETURN_ON_FAILURE),
34-
LINK_TIME_OPTIMIZATION = base_flag(LINK_TIME_OPTIMIZATION),
35-
RETAIN_LINK_TIME_OPTIMIZATION_INFO = base_flag(RETAIN_LINK_TIME_OPTIMIZATION_INFO)
3632
};
3733
#undef base_flag
3834

‎include/nbl/video/IGPURayTracingPipeline.h

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,6 @@ class IGPURayTracingPipeline : public IBackendObject, public asset::IRayTracingP
2525

2626
struct SCreationParams final : pipeline_t::SCreationParams, SPipelineCreationParams<const IGPURayTracingPipeline>
2727
{
28-
#define base_flag(F) static_cast<uint64_t>(pipeline_t::SCreationParams::FLAGS::F)
29-
enum class FLAGS : uint64_t
30-
{
31-
NONE = base_flag(NONE),
32-
DISABLE_OPTIMIZATIONS = base_flag(DISABLE_OPTIMIZATIONS),
33-
ALLOW_DERIVATIVES = base_flag(ALLOW_DERIVATIVES),
34-
CAPTURE_STATISTICS = base_flag(CAPTURE_STATISTICS),
35-
CAPTURE_INTERNAL_REPRESENTATIONS = base_flag(CAPTURE_INTERNAL_REPRESENTATIONS),
36-
FAIL_ON_PIPELINE_COMPILE_REQUIRED = base_flag(FAIL_ON_PIPELINE_COMPILE_REQUIRED),
37-
EARLY_RETURN_ON_FAILURE = base_flag(EARLY_RETURN_ON_FAILURE),
38-
LINK_TIME_OPTIMIZATION = base_flag(LINK_TIME_OPTIMIZATION),
39-
RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT = base_flag(RETAIN_LINK_TIME_OPTIMIZATION_INFO),
40-
SKIP_TRIANGLES = base_flag(SKIP_TRIANGLES),
41-
SKIP_AABBS = base_flag(SKIP_AABBS),
42-
NO_NULL_ANY_HIT_SHADERS = 1<<14,
43-
NO_NULL_CLOSEST_HIT_SHADERS = 1<<15,
44-
NO_NULL_MISS_SHADERS = 1<<16,
45-
NO_NULL_INTERSECTION_SHADERS = 1<<17,
46-
ALLOW_MOTION = 1<<20,
47-
};
48-
#undef base_flag
4928

5029
inline SSpecializationValidationResult valid() const
5130
{

0 commit comments

Comments
 (0)