New tgmath

22_CppCompat/app_resources/intrinsicsTest.comp.hlsl

@@ -0,0 +1,16 @@
+//// Copyright (C) 2023-2024 - DevSH Graphics Programming Sp. z O.O.
+//// This file is part of the "Nabla Engine".
+//// For conditions of distribution and use, see copyright notice in nabla.h
+#pragma shader_stage(compute)
+
+#include "common.hlsl"
+
+[[vk::binding(0, 0)]] RWStructuredBuffer<IntrinsicsIntputTestValues> inputTestValues;
+[[vk::binding(1, 0)]] RWStructuredBuffer<IntrinsicsTestValues> outputTestValues;
+
+[numthreads(256, 1, 1)]
+void main(uint3 invocationID : SV_DispatchThreadID)
+{
+    if(invocationID.x == 0)
+        outputTestValues[0].fillTestValues(inputTestValues[0]);
+}

22_CppCompat/app_resources/tgmathTest.comp.hlsl

@@ -0,0 +1,16 @@
+//// Copyright (C) 2023-2024 - DevSH Graphics Programming Sp. z O.O.
+//// This file is part of the "Nabla Engine".
+//// For conditions of distribution and use, see copyright notice in nabla.h
+#pragma shader_stage(compute)
+
+#include "common.hlsl"
+
+[[vk::binding(0, 0)]] RWStructuredBuffer<TgmathIntputTestValues> inputTestValues;
+[[vk::binding(1, 0)]] RWStructuredBuffer<TgmathTestValues> outputTestValues;
+
+[numthreads(256, 1, 1)]
+void main(uint3 invocationID : SV_DispatchThreadID)
+{
+    if(invocationID.x == 0)
+        outputTestValues[0].fillTestValues(inputTestValues[0]);
+}

22_CppCompat/main.cpp

@@ -11,6 +11,8 @@
 
 #include "app_resources/common.hlsl"
 
+#include "CTgmathTester.h"
+#include "CIntrinsicsTester.h"
 
 using namespace nbl::core;
 using namespace nbl::hlsl;
@@ -56,11 +58,31 @@ class CompatibilityTest final : public MonoDeviceApplication, public MonoAssetMa
             return false;
         if (!asset_base_t::onAppInitialized(std::move(system)))
             return false;
-
+
+        ITester::PipelineSetupData pplnSetupData;
+        pplnSetupData.device = m_device;
+        pplnSetupData.api = m_api;
+        pplnSetupData.assetMgr = m_assetMgr;
+        pplnSetupData.logger = m_logger;
+        pplnSetupData.physicalDevice = m_physicalDevice;
+        pplnSetupData.computeFamilyIndex = getComputeQueue()->getFamilyIndex();
+
+        {
+            CTgmathTester tgmathTester;
+            pplnSetupData.testShaderPath = "app_resources/tgmathTest.comp.hlsl";
+            tgmathTester.setupPipeline<TgmathIntputTestValues, TgmathTestValues>(pplnSetupData);
+            tgmathTester.performTests();
+        }
+        {
+            CIntrinsicsTester intrinsicsTester;
+            pplnSetupData.testShaderPath = "app_resources/intrinsicsTest.comp.hlsl";
+            intrinsicsTester.setupPipeline<IntrinsicsIntputTestValues, IntrinsicsTestValues>(pplnSetupData);
+            intrinsicsTester.performTests();
+        }
+
         m_queue = m_device->getQueue(0, 0);
         m_commandPool = m_device->createCommandPool(m_queue->getFamilyIndex(), IGPUCommandPool::CREATE_FLAGS::RESET_COMMAND_BUFFER_BIT);
         m_commandPool->createCommandBuffers(IGPUCommandPool::BUFFER_LEVEL::PRIMARY, { &m_cmdbuf,1 }, smart_refctd_ptr(m_logger));
-
 
         smart_refctd_ptr<IGPUShader> shader;
         {
@@ -211,7 +233,6 @@ class CompatibilityTest final : public MonoDeviceApplication, public MonoAssetMa
         constexpr auto StartedValue = 0;
 
         smart_refctd_ptr<ISemaphore> progress = m_device->createSemaphore(StartedValue);
-
 
         m_cmdbuf->reset(IGPUCommandBuffer::RESET_FLAGS::RELEASE_RESOURCES_BIT);
         m_cmdbuf->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT);
@@ -562,7 +583,7 @@ void cpu_tests()
     auto zero = cross(x,x);
     auto lenX2 = dot(x,x);
     //auto z_inv = inverse(z); //busted return type conversion
-    auto mid = lerp(x,x,0.5f);
+    auto mid = nbl::hlsl::mix(x,x,float32_t3(0.5f));
     //auto w = transpose(y); //also busted
 
 
@@ -761,8 +782,8 @@ void cpu_tests()
     TEST_CMATH(fdim, 2, type) \
 
 
-    TEST_CMATH_FOR_TYPE(float32_t)
-    TEST_CMATH_FOR_TYPE(float64_t)
+    //TEST_CMATH_FOR_TYPE(float32_t)
+    //TEST_CMATH_FOR_TYPE(float64_t)
 #endif
     std::cout << "cpu tests done\n";
 }

28_FFTBloom/app_resources/fft_convolve_ifft.hlsl

@@ -1,5 +1,4 @@
 #include "fft_mirror_common.hlsl"
-#include "nbl/builtin/hlsl/bitreverse.hlsl"
 
 [[vk::binding(3, 0)]] Texture2DArray<float32_t2> kernelChannels;
 [[vk::binding(1, 0)]] SamplerState samplerState;

28_FFTBloom/app_resources/kernel_fft_second_axis.hlsl

@@ -1,6 +1,5 @@
 #include "fft_mirror_common.hlsl"
 #include "nbl/builtin/hlsl/colorspace/encodeCIEXYZ.hlsl"
-#include "nbl/builtin/hlsl/bitreverse.hlsl"
 
 [[vk::binding(2, 0)]] RWTexture2DArray<float32_t2> kernelChannels;
 

62_CAD/Hatch.cpp

@@ -16,7 +16,7 @@ bool Hatch::Segment::isStraightLineConstantMajor() const
 		p1 = originalBezier->P1[major], 
 		p2 = originalBezier->P2[major];
 	//assert(p0 <= p1 && p1 <= p2); (PRECISION ISSUES ARISE ONCE MORE)
-	return abs(p1 - p0) <= core::exp2(-24.0) && abs(p2 - p0) <= exp(-24);
+	return abs(p1 - p0) <= core::exp2(-24.0) && abs(p2 - p0) <= hlsl::exp(-24.0f);
 }
 
 std::array<double, 2> Hatch::Segment::intersect(const Segment& other) const

62_CAD/main.cpp

@@ -31,6 +31,13 @@ using namespace video;
 #include "HatchGlyphBuilder.h"
 #include "GeoTexture.h"
 
+#include <nbl/builtin/hlsl/tgmath.hlsl>
+
+//TODO: remove
+#include <nbl/builtin/hlsl/concepts/core.hlsl>
+#include <nbl/builtin/hlsl/concepts/vector.hlsl>
+#include <nbl/builtin/hlsl/concepts/matrix.hlsl>
+
 #include <chrono>
 #define BENCHMARK_TILL_FIRST_FRAME
 
@@ -66,7 +73,7 @@ constexpr std::array<float, (uint32_t)ExampleMode::CASE_COUNT> cameraExtents =
 	600.0,	// CASE_8
 };
 
-constexpr ExampleMode mode = ExampleMode::CASE_5;
+constexpr ExampleMode mode = ExampleMode::CASE_4;
 
 class Camera2D
 {
@@ -393,9 +400,9 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 		}
 
 		IGPUSampler::SParams samplerParams = {};
-		samplerParams.TextureWrapU = IGPUSampler::ETC_CLAMP_TO_BORDER;
-		samplerParams.TextureWrapV = IGPUSampler::ETC_CLAMP_TO_BORDER;
-		samplerParams.TextureWrapW = IGPUSampler::ETC_CLAMP_TO_BORDER;
+		samplerParams.TextureWrapU = IGPUSampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_BORDER;
+		samplerParams.TextureWrapV = IGPUSampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_BORDER;
+		samplerParams.TextureWrapW = IGPUSampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_BORDER;
 		samplerParams.BorderColor  = IGPUSampler::ETBC_FLOAT_OPAQUE_WHITE; // positive means outside shape
 		samplerParams.MinFilter		= IGPUSampler::ETF_LINEAR;
 		samplerParams.MaxFilter		= IGPUSampler::ETF_LINEAR;

62_CAD/shaders/globals.hlsl

@@ -9,6 +9,7 @@
 #include <nbl/builtin/hlsl/cpp_compat/basic.h>
 #include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl>
 #include <nbl/builtin/hlsl/shapes/beziers.hlsl>
+#include <nbl/builtin/hlsl/tgmath.hlsl>
 
 #ifdef __HLSL_VERSION
 #include <nbl/builtin/hlsl/math/equations/quadratic.hlsl>

66_HLSLBxDFTests/CMakeLists.txt

@@ -0,0 +1,28 @@
+set(NBL_INCLUDE_SEARCH_DIRECTORIES
+	"${CMAKE_CURRENT_SOURCE_DIR}/include"
+)
+
+include(common RESULT_VARIABLE RES)
+if(NOT RES)
+	message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
+endif()
+
+nbl_create_executable_project("" "" "${NBL_INCLUDE_SEARCH_DIRECTORIES}" "" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
+
+if(NBL_EMBED_BUILTIN_RESOURCES)
+	set(_BR_TARGET_ ${EXECUTABLE_NAME}_builtinResourceData)
+	set(RESOURCE_DIR "app_resources")
+
+	get_filename_component(_SEARCH_DIRECTORIES_ "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
+	get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
+	get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)
+
+    file(GLOB_RECURSE BUILTIN_RESOURCE_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}" CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}/*")
+    foreach(RES_FILE ${BUILTIN_RESOURCE_FILES})
+      LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "${RES_FILE}")
+    endforeach()
+
+	ADD_CUSTOM_BUILTIN_RESOURCES(${_BR_TARGET_} RESOURCES_TO_EMBED "${_SEARCH_DIRECTORIES_}" "${RESOURCE_DIR}" "nbl::this_example::builtin" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}")
+
+	LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} ${_BR_TARGET_})
+endif()