Added findMSB and findLSB specialization for enum types

Author: Przemog1

include/nbl/asset/ICPUGraphicsPipeline.h

@@ -93,7 +93,7 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip
 
 		inline int8_t stageToIndex(const ICPUShader::E_SHADER_STAGE stage) const override
 		{
-			const auto stageIx = hlsl::findLSB(static_cast<std::underlying_type_t<ICPUShader::E_SHADER_STAGE>>(stage));
+			const auto stageIx = hlsl::findLSB(stage);
 			if (stageIx<0 || stageIx>=GRAPHICS_SHADER_STAGE_COUNT || hlsl::bitCount(stage)!=1)
 				return -1;
 			return stageIx;

include/nbl/asset/ICPURenderpassIndependentPipeline.h

@@ -91,14 +91,14 @@ class ICPURenderpassIndependentPipeline : public IRenderpassIndependentPipeline<
 		inline IShader::SSpecInfo<ICPUShader> getSpecInfo(const ICPUShader::E_SHADER_STAGE stage)
 		{
 			assert(isMutable());
-			const auto stageIx = hlsl::findLSB(static_cast<std::underlying_type_t<ICPUShader::E_SHADER_STAGE>>(stage));
+			const auto stageIx = hlsl::findLSB(stage);
 			if (stageIx<0 || stageIx>=GRAPHICS_SHADER_STAGE_COUNT || hlsl::bitCount(stage)!=1)
 				return {};
 			return m_infos[stageIx];
 		}
 		inline IShader::SSpecInfo<const ICPUShader> getSpecInfo(const ICPUShader::E_SHADER_STAGE stage) const
 		{
-			const auto stageIx = hlsl::findLSB(static_cast<std::underlying_type_t<ICPUShader::E_SHADER_STAGE>>(stage));
+			const auto stageIx = hlsl::findLSB(stage);
 			if (stageIx<0 || stageIx>=GRAPHICS_SHADER_STAGE_COUNT || hlsl::bitCount(stage)!=1)
 				return {};
 			return m_infos[stageIx];
@@ -110,7 +110,7 @@ class ICPURenderpassIndependentPipeline : public IRenderpassIndependentPipeline<
             if (specSize<0)
                 return false;
 			const auto stage = info.shader->getStage();
-			const auto stageIx = hlsl::findLSB(static_cast<std::underlying_type_t<ICPUShader::E_SHADER_STAGE>>(stage));
+			const auto stageIx = hlsl::findLSB(stage);
 			if (stageIx<0 || stageIx>=GRAPHICS_SHADER_STAGE_COUNT || hlsl::bitCount(stage)!=1)
 				return false;
 			m_infos[stageIx] = info;

include/nbl/builtin/hlsl/cpp_compat/impl/intrinsics_impl.hlsl

@@ -153,6 +153,21 @@ struct find_msb_helper<vector<int32_t, N> >
 	}
 };
 
+#ifndef __HLSL_VERSION
+
+template<typename EnumType>
+	requires std::is_enum_v<EnumType>
+struct find_msb_helper<EnumType>
+{
+	static int32_t findMSB(NBL_CONST_REF_ARG(EnumType) val)
+	{
+		using underlying_t = std::underlying_type_t<EnumType>;
+		return find_msb_helper<underlying_t>::findMSB(static_cast<underlying_t>(val));
+	}
+};
+
+#endif
+
 template<typename Integer>
 struct find_lsb_helper;
 
@@ -252,6 +267,21 @@ struct find_lsb_helper<vector<uint32_t, N> >
 	}
 };
 
+#ifndef __HLSL_VERSION
+
+template<typename EnumType>
+requires std::is_enum_v<EnumType>
+struct find_lsb_helper<EnumType>
+{
+	static int32_t findLSB(NBL_CONST_REF_ARG(EnumType) val)
+	{
+		using underlying_t = std::underlying_type_t<EnumType>;
+		return find_lsb_helper<underlying_t>::findLSB(static_cast<underlying_t>(val));
+	}
+};
+
+#endif
+
 template<typename Integer>
 struct find_msb_return_type
 {

include/nbl/core/util/bitflag.h

@@ -61,8 +61,7 @@ namespace nbl::hlsl::cpp_compat_intrinsics_impl
 	{
 		static int32_t findLSB(NBL_CONST_REF_ARG(core::bitflag<ENUM_TYPE>) val)
 		{
-			using underlying_t = typename core::bitflag<ENUM_TYPE>::UNDERLYING_TYPE;
-			return find_lsb_helper<underlying_t>::findLSB(static_cast<underlying_t>(val.value));
+			return find_lsb_helper<ENUM_TYPE>::findLSB(val.value);
 		}
 	};
 
@@ -71,8 +70,7 @@ namespace nbl::hlsl::cpp_compat_intrinsics_impl
 	{
 		static int32_t findMSB(NBL_CONST_REF_ARG(core::bitflag<ENUM_TYPE>) val)
 		{
-			using underlying_t = typename core::bitflag<ENUM_TYPE>::UNDERLYING_TYPE;
-			return find_msb_helper<underlying_t>::findMSB(static_cast<underlying_t>(val.value));
+			return find_msb_helper<ENUM_TYPE>::findMSB(val.value);
 		}
 	};
 }

src/nbl/video/CVulkanGraphicsPipeline.h

@@ -19,7 +19,7 @@ class CVulkanGraphicsPipeline final : public IGPUGraphicsPipeline
 			for (const auto& info : params.shaders)
 			if (info.shader)
 			{
-                const auto stageIx = hlsl::findLSB(static_cast<std::underlying_type_t<asset::IShader::E_SHADER_STAGE>>(info.shader->getStage()));
+                const auto stageIx = hlsl::findLSB(info.shader->getStage());
 				m_shaders[stageIx] = core::smart_refctd_ptr<const CVulkanShader>(static_cast<const CVulkanShader*>(info.shader));
 			}
         }

src/nbl/video/utilities/CAssetConverter.cpp

@@ -1509,7 +1509,7 @@ class GetDependantVisit<ICPUComputePipeline> : public GetDependantVisitBase<ICPU
 		inline auto& getSpecInfo(const IShader::E_SHADER_STAGE stage)
 		{
 			assert(hlsl::bitCount(stage)==1);
-			return specInfo[hlsl::findLSB(static_cast<std::underlying_type_t<IShader::E_SHADER_STAGE>>(stage))];
+			return specInfo[hlsl::findLSB(stage)];
 		}
 
 		// ok to do non owning since some cache owns anyway
@@ -1557,7 +1557,7 @@ class GetDependantVisit<ICPUGraphicsPipeline> : public GetDependantVisitBase<ICP
 		inline auto& getSpecInfo(const IShader::E_SHADER_STAGE stage)
 		{
 			assert(hlsl::bitCount(stage)==1);
-			return specInfo[hlsl::findLSB(static_cast<std::underlying_type_t<IShader::E_SHADER_STAGE>>(stage))];
+			return specInfo[hlsl::findLSB(stage)];
 		}
 
 		// ok to do non owning since some cache owns anyway