Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cpp compat intrinsics refactor #801

Merged
merged 21 commits into from
Dec 18, 2024
Merged

Cpp compat intrinsics refactor #801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
36baa31
Renamed intrinsics.h to intrinsics.hlsl
Przemog1 Dec 10, 2024
62490ee
Added vector_traits.hlsl
Przemog1 Dec 10, 2024
c1dff94
Added array_accessors.hlsl
Przemog1 Dec 10, 2024
0dbeb8f
Refactored intrinsics for C++ side
Przemog1 Dec 11, 2024
b3fba14
Added GLSL.std.450.hlsl
Przemog1 Dec 11, 2024
8c94b0c
Added some spirv intrinsics
Przemog1 Dec 11, 2024
59e388a
Fix
Przemog1 Dec 11, 2024
75bec97
Bug fix
Przemog1 Dec 11, 2024
2a7953e
Fully implemented intrinsics.hlsl
Przemog1 Dec 11, 2024
3b9658b
Corrections
Przemog1 Dec 12, 2024
fc9b4d4
Added matrix_traits.hlsl
Przemog1 Dec 12, 2024
99b478b
Moved every GLSL.std.450 intrinsic spriv function from spriv_intrinsi…
Przemog1 Dec 12, 2024
e0e1b8c
Fix
Przemog1 Dec 12, 2024
8e771d0
Some spirv intrinsic function will work with vectors now
Przemog1 Dec 13, 2024
2e151f6
Moved cpp_compat_intrinsics_impl to another file
Przemog1 Dec 13, 2024
172748a
Corrections
Przemog1 Dec 16, 2024
b8e6d94
Created template findMSB and findLSB template specialization for ever…
Przemog1 Dec 16, 2024
889eabe
Resolved conflicts, merged master
Przemog1 Dec 16, 2024
c079825
Added findMSB and findLSB specialization for enum types
Przemog1 Dec 17, 2024
46ff7c8
Fix
Przemog1 Dec 17, 2024
7528d4e
Another fix
Przemog1 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions include/nbl/builtin/hlsl/cpp_compat/intrinsics.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ template<typename Integer>
int bitCount(NBL_CONST_REF_ARG(Integer) val)
{
#ifdef __HLSL_VERSION

return countbits(val);
#else
return glm::bitCount(val);
#endif
Expand All @@ -33,7 +33,7 @@ template<typename T>
vector<T, 3> cross(NBL_CONST_REF_ARG(vector<T, 3>) lhs, NBL_CONST_REF_ARG(vector<T, 3>) rhs)
{
#ifdef __HLSL_VERSION

return spirv::cross(lhs, rhs);
#else
return glm::cross(lhs, rhs);
#endif
Expand All @@ -43,7 +43,7 @@ template<typename T>
T clamp(NBL_CONST_REF_ARG(T) val, NBL_CONST_REF_ARG(T) min, NBL_CONST_REF_ARG(T) max)
{
#ifdef __HLSL_VERSION

return clamp(val, min, max);
#else
return glm::clamp(val, min, max);
#endif
Expand Down Expand Up @@ -185,7 +185,7 @@ template<typename T, uint16_t N, uint16_t M>
inline matrix<T, N, M> inverse(NBL_CONST_REF_ARG(matrix<T, N, M>) m)
{
#ifdef __HLSL_VERSION

return spirv::matrixInverse(m);
#else
return reinterpret_cast<matrix<T, N, M>&>(glm::inverse(reinterpret_cast<typename matrix<T, N, M>::Base const&>(m)));
#endif
Expand All @@ -195,7 +195,7 @@ template<typename T, typename U>
inline T lerp(NBL_CONST_REF_ARG(T) x, NBL_CONST_REF_ARG(T) y, NBL_CONST_REF_ARG(U) a)
{
#ifdef __HLSL_VERSION

return spirv::fMix(x, y, a);
#else
if constexpr (std::is_same_v<U, bool>)
return a ? y : x;
Expand All @@ -220,7 +220,7 @@ template<typename T, uint16_t N, uint16_t M>
inline matrix<T, M, N> transpose(NBL_CONST_REF_ARG(matrix<T, N, M>) m)
{
#ifdef __HLSL_VERSION

return spirv::transpose(m);
#else
return reinterpret_cast<matrix<T, M, N>&>(glm::transpose(reinterpret_cast<typename matrix<T, N, M>::Base const&>(m)));
#endif
Expand Down
4 changes: 4 additions & 0 deletions include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,10 @@ template<typename FloatingPoint>
[[vk::ext_instruction( spv::OpIsInf )]]
enable_if_t<is_floating_point_v<FloatingPoint>, bool> isInf(FloatingPoint val);

template<typename Matrix>
[[vk::ext_instruction( spv::OpTranspose )]]
Matrix transpose(NBL_CONST_REF_ARG(Matrix) mat);

}

#endif
Expand Down
12 changes: 12 additions & 0 deletions include/nbl/builtin/hlsl/spirv_intrinsics/glsl.std.450.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ template<typename FloatingPoint>
[[vk::ext_instruction(GLSLstd450::GLSLstd450Floor, "GLSL.std.450")]]
enable_if_t<is_floating_point_v<FloatingPoint>, FloatingPoint> floor(FloatingPoint val);

template<typename FloatingPoint>
[[vk::ext_instruction(GLSLstd450::GLSLstd450Cross, "GLSL.std.450")]]
enable_if_t<is_floating_point_v<FloatingPoint>, vector<FloatingPoint, 3> > cross(in vector<FloatingPoint, 3> lhs, in vector<FloatingPoint, 3> rhs);

template<typename FloatingPoint>
[[vk::ext_instruction(GLSLstd450::GLSLstd450FMix, "GLSL.std.450")]]
enable_if_t<is_floating_point_v<FloatingPoint>, FloatingPoint> fMix(FloatingPoint val);

template<typename SquareMatrix>
[[vk::ext_instruction(GLSLstd450::GLSLstd450Determinant, "GLSL.std.450")]]
SquareMatrix determinant(in SquareMatrix mat);

}
}
}
Expand Down