BxDF tests

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
 {
@@ -637,6 +644,107 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 
 	inline bool onAppInitialized(smart_refctd_ptr<ISystem>&& system) override
 	{
+		{
+			using ef64 = hlsl::emulated_float64_t<true, true>;
+			using NormalVec = hlsl::vector<float, 3>;
+			using EmulatedVec = hlsl::emulated_vector_t3<ef64>;
+			using NormalMatrix = hlsl::matrix<float, 3, 3>;
+			using EmulatedMatrix = hlsl::emulated_matrix_t3x3<ef64>;
+
+			auto createNormalVec = [](float x, float y, float z) -> NormalVec
+				{
+					NormalVec output;
+					output.x = x;
+					output.y = y;
+					output.z = z;
+
+					return output;
+				};
+			auto createEmulatedVec = [](float x, float y, float z) -> EmulatedVec
+				{
+					EmulatedVec output;
+					output.x = hlsl::emulated_float64_t<true, true>::create(x);
+					output.y = hlsl::emulated_float64_t<true, true>::create(y);
+					output.z = hlsl::emulated_float64_t<true, true>::create(z);
+
+					return output;
+				};
+
+			auto createNormalMat = [](float a0, float a1, float a2, float b0, float b1, float b2, float c0, float c1, float c2) -> NormalMatrix
+				{
+					NormalMatrix output;
+					output[0][0] = a0;
+					output[0][1] = a1;
+					output[0][2] = a2;
+
+					output[1][0] = b0;
+					output[1][1] = b1;
+					output[1][2] = b2;
+
+					output[2][0] = c0;
+					output[2][1] = c1;
+					output[2][2] = c2;
+
+					return output;
+				};
+
+			auto createEmulatedMat = [](float a0, float a1, float a2, float b0, float b1, float b2, float c0, float c1, float c2) -> EmulatedMatrix
+				{
+					EmulatedMatrix output;
+					output.rows[0].x = ef64::create(a0);
+					output.rows[0].y = ef64::create(a1);
+					output.rows[0].z = ef64::create(a2);
+
+					output.rows[1].x = ef64::create(b0);
+					output.rows[1].y = ef64::create(b1);
+					output.rows[1].z = ef64::create(b2);
+
+					output.rows[2].x = ef64::create(c0);
+					output.rows[2].y = ef64::create(c1);
+					output.rows[2].z = ef64::create(c2);
+
+					return output;
+				};
+
+			{
+				/*NormalVec a = createNormalVec(1, 2, 3);
+				NormalVec b = createNormalVec(4, 5, 6);
+
+				auto c = hlsl::findMSB(a);
+				__debugbreak();*/
+			}
+
+			{
+				/*EmulatedVec a = createEmulatedVec(1, 2, 3);
+				EmulatedVec b = createEmulatedVec(4, 5, 6);
+
+				auto c = hlsl::findMSB(a);
+				__debugbreak();*/
+			}
+
+			{
+				/*NormalMatrix a = createNormalMat(1, 2, 3, 4, 5, 6, 7, 8, 9);
+
+				hlsl::matrix_traits<NormalMatrix> asdf;
+
+				auto c = hlsl::determinant(a);
+				__debugbreak();*/
+			}
+
+			{
+				/*auto a = createEmulatedMat(1, 2, 3, 4, 5, 6, 7, 8, 9);
+				auto b = createEmulatedMat(10, 11, 12, 13, 14, 15, 16, 17, 18);
+
+				auto c = nbl::hlsl::mul(a, b);
+
+				NormalVec r0 = nbl::hlsl::_static_cast<NormalVec>(c.rows[0]);
+				NormalVec r1 = nbl::hlsl::_static_cast<NormalVec>(c.rows[1]);
+				NormalVec r2 = nbl::hlsl::_static_cast<NormalVec>(c.rows[2]);
+
+				__debugbreak();*/
+			}
+		}
+
 		m_inputSystem = make_smart_refctd_ptr<InputSystem>(logger_opt_smart_ptr(smart_refctd_ptr(m_logger)));
 
 		// Remember to call the base class initialization!

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>

62_CAD/shaders/main_pipeline/vertex_shader.hlsl

@@ -93,7 +93,7 @@ PSInput main(uint vertexID : SV_VertexID)
     // Ok, brainfart, a vertex can belong to multiple triangles, I was thinking of AA but triangles share vertices, nevermind my comment above.
 
     const uint vertexIdx = vertexID & 0x3u;
-    const uint objectID = vertexID >> 2;
+    const uint objectID = (vertexID >> 2) * a;
 
     DrawObject drawObj = drawObjects[objectID];
 

66_HLSLBxDFTests/CMakeLists.txt

@@ -0,0 +1,32 @@
+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()
+
+add_dependencies(${EXECUTABLE_NAME} OpenEXR)
+target_link_libraries(${EXECUTABLE_NAME} PRIVATE OpenEXR)
+target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:OpenEXR,INCLUDE_DIRECTORIES>)

66_HLSLBxDFTests/app_resources/config.json

@@ -0,0 +1,20 @@
+{
+    "logInfo": false,
+    "TestJacobian": {
+        "runs": 10
+    },
+    "TestReciprocity": {
+        "runs": 10
+    },
+    "TestBucket": {
+        "runs": 10,
+        "samples": 500
+    },
+    "TestChi2": {
+        "runs": 5,
+        "samples": 1000000,
+        "thetaSplits": 80,
+        "phiSplits": 160,
+        "writeFrequencies": false
+    }
+}