Add const to hlsl::ShaderStage

kevyuu · kevyuu · commit 3cf455406a03 · 2025-06-17T15:18:29.000+07:00
diff --git a/include/nbl/asset/ICPUComputePipeline.h b/include/nbl/asset/ICPUComputePipeline.h
@@ -29,14 +29,14 @@ class ICPUComputePipeline final : public ICPUPipeline<IComputePipeline<ICPUPipel
         constexpr static inline auto AssetType = ET_COMPUTE_PIPELINE;
         inline E_TYPE getAssetType() const override { return AssetType; }
 
-        inline std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const override
+        inline std::span<const SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage) const override
         {
             if (stage==hlsl::ShaderStage::ESS_COMPUTE)
                 return {&m_specInfo,1};
             return {};
         }
 
-        inline std::span<SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage)
+        inline std::span<SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage)
         {
             return base_t::getSpecInfos(stage);
         }
diff --git a/include/nbl/asset/ICPUGraphicsPipeline.h b/include/nbl/asset/ICPUGraphicsPipeline.h
@@ -40,20 +40,20 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip
             return m_params;
         }
 
-        inline std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const override final
+        inline std::span<const SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage) const override final
         {
             const auto stageIndex = stageToIndex(stage);
             if (stageIndex != -1)
                 return { &m_specInfos[stageIndex], 1 };
             return {};
         }
 
-        inline std::span<SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage)
+        inline std::span<SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage)
         {
             return base_t::getSpecInfos(stage);
         }
 
-        SShaderSpecInfo* getSpecInfo(hlsl::ShaderStage stage)
+        SShaderSpecInfo* getSpecInfo(const hlsl::ShaderStage stage)
         {
             if (!isMutable()) return nullptr;
             const auto stageIndex = stageToIndex(stage);
@@ -62,7 +62,7 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip
             return nullptr;
         }
 
-        const SShaderSpecInfo* getSpecInfo(hlsl::ShaderStage stage) const
+        const SShaderSpecInfo* getSpecInfo(const hlsl::ShaderStage stage) const
         {
             const auto stageIndex = stageToIndex(stage);
             if (stageIndex != -1)
diff --git a/include/nbl/asset/ICPUPipeline.h b/include/nbl/asset/ICPUPipeline.h
@@ -93,7 +93,7 @@ class ICPUPipelineBase
             }
         };
 
-        virtual std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const = 0;
+        virtual std::span<const SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage) const = 0;
 
 };
 
@@ -132,7 +132,7 @@ class ICPUPipeline : public IAsset, public PipelineNonAssetBase, public ICPUPipe
         }
 
         // Note(kevinyu): For some reason overload resolution cannot find this function when I name id getSpecInfos. It always use the const variant. Will check on it later.
-        inline std::span<SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage)
+        inline std::span<SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage)
         {
             if (!isMutable()) return {};
             const this_t* constPipeline = const_cast<const this_t*>(this);
diff --git a/include/nbl/asset/ICPURayTracingPipeline.h b/include/nbl/asset/ICPURayTracingPipeline.h
@@ -36,7 +36,7 @@ class ICPURayTracingPipeline final : public ICPUPipeline<IRayTracingPipeline<ICP
         constexpr static inline auto AssetType = ET_RAYTRACING_PIPELINE;
         inline E_TYPE getAssetType() const override { return AssetType; }
         
-        inline std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const override final
+        inline std::span<const SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage) const override final
         {
             switch (stage) 
             {
@@ -57,12 +57,12 @@ class ICPURayTracingPipeline final : public ICPUPipeline<IRayTracingPipeline<ICP
             return {};
         }
 
-        inline std::span<SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage)
+        inline std::span<SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage)
         {
             return base_t::getSpecInfos(stage);
         }
 
-        inline core::vector<SShaderSpecInfo>* getSpecInfoVector(hlsl::ShaderStage stage)
+        inline core::vector<SShaderSpecInfo>* getSpecInfoVector(const hlsl::ShaderStage stage)
         {
             if (!isMutable()) return nullptr;
             switch (stage) 

Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,14 @@ class ICPUComputePipeline final : public ICPUPipeline<IComputePipeline<ICPUPipel`
`29`	`29`	`constexpr static inline auto AssetType = ET_COMPUTE_PIPELINE;`
`30`	`30`	`inline E_TYPE getAssetType() const override { return AssetType; }`
`31`	`31`
`32`		`- inline std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const override`
	`32`	`+ inline std::span<const SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage) const override`
`33`	`33`	`{`
`34`	`34`	`if (stage==hlsl::ShaderStage::ESS_COMPUTE)`
`35`	`35`	`return {&m_specInfo,1};`
`36`	`36`	`return {};`
`37`	`37`	`}`
`38`	`38`
`39`		`- inline std::span<SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage)`
	`39`	`+ inline std::span<SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage)`
`40`	`40`	`{`
`41`	`41`	`return base_t::getSpecInfos(stage);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,20 +40,20 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip`
`40`	`40`	`return m_params;`
`41`	`41`	`}`
`42`	`42`
`43`		`- inline std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const override final`
	`43`	`+ inline std::span<const SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage) const override final`
`44`	`44`	`{`
`45`	`45`	`const auto stageIndex = stageToIndex(stage);`
`46`	`46`	`if (stageIndex != -1)`
`47`	`47`	`return { &m_specInfos[stageIndex], 1 };`
`48`	`48`	`return {};`
`49`	`49`	`}`
`50`	`50`
`51`		`- inline std::span<SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage)`
	`51`	`+ inline std::span<SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage)`
`52`	`52`	`{`
`53`	`53`	`return base_t::getSpecInfos(stage);`
`54`	`54`	`}`
`55`	`55`
`56`		`- SShaderSpecInfo* getSpecInfo(hlsl::ShaderStage stage)`
	`56`	`+ SShaderSpecInfo* getSpecInfo(const hlsl::ShaderStage stage)`
`57`	`57`	`{`
`58`	`58`	`if (!isMutable()) return nullptr;`
`59`	`59`	`const auto stageIndex = stageToIndex(stage);`
`@@ -62,7 +62,7 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip`
`62`	`62`	`return nullptr;`
`63`	`63`	`}`
`64`	`64`
`65`		`- const SShaderSpecInfo* getSpecInfo(hlsl::ShaderStage stage) const`
	`65`	`+ const SShaderSpecInfo* getSpecInfo(const hlsl::ShaderStage stage) const`
`66`	`66`	`{`
`67`	`67`	`const auto stageIndex = stageToIndex(stage);`
`68`	`68`	`if (stageIndex != -1)`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class ICPUPipelineBase`
`93`	`93`	`}`
`94`	`94`	`};`
`95`	`95`
`96`		`- virtual std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const = 0;`
	`96`	`+ virtual std::span<const SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage) const = 0;`
`97`	`97`
`98`	`98`	`};`
`99`	`99`
`@@ -132,7 +132,7 @@ class ICPUPipeline : public IAsset, public PipelineNonAssetBase, public ICPUPipe`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`// Note(kevinyu): For some reason overload resolution cannot find this function when I name id getSpecInfos. It always use the const variant. Will check on it later.`
`135`		`- inline std::span<SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage)`
	`135`	`+ inline std::span<SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage)`
`136`	`136`	`{`
`137`	`137`	`if (!isMutable()) return {};`
`138`	`138`	`const this_t* constPipeline = const_cast<const this_t*>(this);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ICPURayTracingPipeline final : public ICPUPipeline<IRayTracingPipeline<ICP`
`36`	`36`	`constexpr static inline auto AssetType = ET_RAYTRACING_PIPELINE;`
`37`	`37`	`inline E_TYPE getAssetType() const override { return AssetType; }`
`38`	`38`
`39`		`- inline std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const override final`
	`39`	`+ inline std::span<const SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage) const override final`
`40`	`40`	`{`
`41`	`41`	`switch (stage)`
`42`	`42`	`{`
`@@ -57,12 +57,12 @@ class ICPURayTracingPipeline final : public ICPUPipeline<IRayTracingPipeline<ICP`
`57`	`57`	`return {};`
`58`	`58`	`}`
`59`	`59`
`60`		`- inline std::span<SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage)`
	`60`	`+ inline std::span<SShaderSpecInfo> getSpecInfos(const hlsl::ShaderStage stage)`
`61`	`61`	`{`
`62`	`62`	`return base_t::getSpecInfos(stage);`
`63`	`63`	`}`
`64`	`64`
`65`		`- inline core::vector<SShaderSpecInfo>* getSpecInfoVector(hlsl::ShaderStage stage)`
	`65`	`+ inline core::vector<SShaderSpecInfo>* getSpecInfoVector(const hlsl::ShaderStage stage)`
`66`	`66`	`{`
`67`	`67`	`if (!isMutable()) return nullptr;`
`68`	`68`	`switch (stage)`