Skip to content

Conversation

@Przemog1
Copy link
Contributor

No description provided.

@devshgraphicsprogramming
Copy link
Member

devshgraphicsprogramming commented Feb 8, 2025

@keptsecret can you merge master into bxdf_unit_tests so there's less of a diff here?

Actually @Przemog1 can you make a cherrypicked branch, because they're ready to merge.

Comment on lines +126 to +132
#ifndef __HLSL_VERSION
nbl::hlsl::vector<int, 3> isnanVec;
nbl::hlsl::vector<int, 3> isinfVec;
#else
vector<int, 3> isnanVec;
vector<int, 3> isinfVec;
#endif

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

leave a comment that we can't fix this because using namespace nbl::hlsl would cause ambiguous math functions below and we can't add a nbl::hlsl alias for the builtin hLSL vector type because of microsoft/DirectXShaderCompiler#7035

@devshgraphicsprogramming devshgraphicsprogramming changed the base branch from bxdf_unit_tests to master February 24, 2025 19:55
@devshgraphicsprogramming devshgraphicsprogramming merged commit ff95b3b into master Feb 24, 2025
1 check failed
@devshgraphicsprogramming devshgraphicsprogramming deleted the new_tgmath branch February 24, 2025 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants