Merge remote-tracking branch 'origin/master' into dynamicJsonDepsInstall

Author: Hazardu

3rdparty/dxc/CMakeLists.txt

@@ -172,8 +172,8 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
 	include("${NBL_ROOT_PATH}/src/nbl/builtin/utils.cmake")
 
     # SPIRV Header in builtin resources, nbl paths as aliases
-    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "1.2/spirv.h")
-    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "1.2/spirv.hpp")
+    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "unified1/spirv.h")
+    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "unified1/spirv.hpp")
 
     ADD_CUSTOM_BUILTIN_RESOURCES(dxcBuiltinResourceData SPIRV_RESOURCES_TO_EMBED "${_SPIRV_BR_BUNDLE_SEARCH_DIRECTORY_}" "spirv" "spirv::builtin" "${_SPIRV_BR_OUTPUT_DIRECTORY_HEADER_}" "${_SPIRV_BR_OUTPUT_DIRECTORY_SOURCE_}" "STATIC" "INTERNAL")
 endif()

3rdparty/dxc/Readme.md

@@ -0,0 +1,89 @@
+# How to update the DXC module
+
+## FIRST TIME SETUP: Make sure you have the correct remotes!
+
+The following submodules as initialized on your system should have `origin` pointing at the `[email protected]:Devsh-Graphics-Programming` fork.
+
+Then a remote `Khronos` for the SPIR-V submodules, and `Microsoft` for the DXC.
+
+If they don't then you can correct that with `git remote add [RemoteName] [email protected]:[Organisation]/[Repo-Name].git` and `git remote remove [RemoteName]`
+
+## IF YOU GET `There is no tracking information for the current branch`
+
+just make the branch track the origin
+```
+git branch --set-upstream-to=origin/[BranchName] [BranchName]
+```
+
+## Its Basically an Depth First Search with a Prologue and Epilogue
+
+```
+checkout correct branch HEAD
+[optional] Merge latest stuff from original project
+recurse()
+commit
+push
+```
+
+### First make sure you're on some Nabla branch Head
+
+Just `git pull` and make sure you're tracking a branch.
+
+### Make sure DXC is tracked and pointing at HEAD
+
+```
+cd ./3rdparty/dxc/dxc
+git fetch
+git checkout devshFixes
+git pull
+```
+
+### SPIR-V Headers: track & get latest head, merge latest upstream, commit and push
+
+```
+cd ./external/SPIRV-Headers
+git fetch
+git checkout header_4_hlsl
+git pull
+git pull Khronos main
+git commit -m "latest Khronos `main` merge"
+git push
+```
+
+### SPIR-V Tools: track & get latest head, merge latest upstream, commit and push
+
+```
+cd ../SPIRV-Tools
+git fetch
+git checkout main
+git pull
+git pull Khronos main
+git commit -m "latest Khronos `main` merge"
+git push
+```
+
+### Back to DXC and commit the submodule pointer changes
+
+```
+cd ..
+git add .
+git commit -m "Update SPIR-V Headers and Tools"
+cd ..
+[optional] git pull Microsoft main
+[optional] git commit -m "merge upstream from Microsoft"
+git push
+```
+
+The reason the upstream from Microsoft is optional is because it might break our Clang hacks like:
+- abuse of `__decltype`
+- `inout` working like a reference, but only sometimes
+- abuse of reference type
+
+### Finally commit the change of DXC commit pointer to Nabla
+
+```
+cd ..
+git add dxc
+git commit -m "Updated DXC"
+git push
+```

3rdparty/dxc/dxc

@@ -98,6 +98,8 @@ if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type: Debug or Release" FORCE)
 endif()
 
+option(_NBL_MEMORY_CONSUMPTION_CHECK_SKIP_ "Turn it ON to bypass memory consumption test given _NBL_JOBS_AMOUNT_. Be aware you are doing it on your own risk of potential build failures!" OFF)
+
 include(ProcessorCount)
 if(NOT DEFINED _NBL_JOBS_AMOUNT_)
 	ProcessorCount(_NBL_JOBS_AMOUNT_)
@@ -112,17 +114,25 @@ cmake_host_system_information(RESULT _NBL_AVAILABLE_PHYSICAL_MEMORY_ QUERY AVAIL
 if(NBL_CI_MODE)
 	math(EXPR _CI_NBL_JOBS_AMOUNT_ "(${_NBL_AVAILABLE_PHYSICAL_MEMORY_} - 512)/(2*1024)") # override with safe bias, respect memory and don't take more then max processors we have
 	if(_CI_NBL_JOBS_AMOUNT_ LESS _NBL_JOBS_AMOUNT_)
+		message(WARNING "Overriding _NBL_JOBS_AMOUNT_: \"${_NBL_JOBS_AMOUNT_}\" with \"${_CI_NBL_JOBS_AMOUNT_}\"")
+	
 		set(_NBL_JOBS_AMOUNT_ "${_CI_NBL_JOBS_AMOUNT_}")
 	endif()
 endif()
 
+set(_NBL_JOBS_AMOUNT_ "${_NBL_JOBS_AMOUNT_}" CACHE STRING "Max jobs amount for the build to be invoked" FORCE)
+
 math(EXPR _NBL_DEBUG_MEMORY_CONSUPTION_WITH_ALL_JOBS_ "${_NBL_JOBS_AMOUNT_}*2*1024") # MB
 math(EXPR _NBL_CURRENTLY_USED_PHYSICAL_MEMORY_ "${_NBL_TOTAL_PHYSICAL_MEMORY_}-${_NBL_AVAILABLE_PHYSICAL_MEMORY_}") # MB
 
 if(_NBL_AVAILABLE_PHYSICAL_MEMORY_ LESS_EQUAL _NBL_DEBUG_MEMORY_CONSUPTION_WITH_ALL_JOBS_) # TODO: we may also add Release and RWDI checks as well
-	if(NOT DEFINED _NBL_MEMORY_CONSUMPTION_CHECK_SKIP_)
-		message(FATAL_ERROR "Memory consumption issue detected! To protect you from compile and linker errors, please read this message.\n\nYour total physical memory is ${_NBL_TOTAL_PHYSICAL_MEMORY_} MBs, your OS is currently using ${_NBL_CURRENTLY_USED_PHYSICAL_MEMORY_} MBs and consumption of your memory with requested ${_NBL_JOBS_AMOUNT_} jobs in Debug configuration may be around ${_NBL_DEBUG_MEMORY_CONSUPTION_WITH_ALL_JOBS_} MBs. Please override '_NBL_JOBS_AMOUNT_' variable by setting it as cache variable and lower the jobs! If you want to continue anyway, please define '_NBL_MEMORY_CONSUMPTION_CHECK_SKIP_' but be aware - you are doing it on your own risk of possible build failures.")
+	if(_NBL_MEMORY_CONSUMPTION_CHECK_SKIP_)
+		set(_NBL_CMAKE_STATUS_ WARNING)
+	else()
+		set(_NBL_CMAKE_STATUS_ FATAL_ERROR)
 	endif()
+	
+	message(${_NBL_CMAKE_STATUS_} "Memory consumption issue detected! To protect you from compile and linker errors, please read this message.\n\nYour total physical memory is ${_NBL_TOTAL_PHYSICAL_MEMORY_} MBs, your OS is currently using ${_NBL_CURRENTLY_USED_PHYSICAL_MEMORY_} MBs and consumption of your memory with requested ${_NBL_JOBS_AMOUNT_} jobs in Debug configuration may be around ${_NBL_DEBUG_MEMORY_CONSUPTION_WITH_ALL_JOBS_} MBs. Please override '_NBL_JOBS_AMOUNT_' variable by setting it as cache variable and lower the jobs! If you want to continue anyway, please define '_NBL_MEMORY_CONSUMPTION_CHECK_SKIP_' but be aware - you are doing it on your own risk of possible build failures.")
 endif()
 
 macro(nbl_adjust_flags)

CMakeLists.txt

@@ -5,26 +5,36 @@
 #ifndef _NBL_BUILTIN_GLSL_COLOR_SPACE_DECODE_CIE_XYZ_INCLUDED_
 #define _NBL_BUILTIN_GLSL_COLOR_SPACE_DECODE_CIE_XYZ_INCLUDED_
 
-const mat3 nbl_glsl_XYZtoscRGB = mat3(  vec3( 3.2404542,-0.9692660, 0.0556434),
-                                        vec3(-1.5371385, 1.8760108,-0.2040259),
-                                        vec3(-0.4985314, 0.0415560, 1.0572252));
+const mat3 nbl_glsl_XYZtoscRGB = mat3(
+    vec3( 3.240970f, -0.969244f,  0.055630f),
+    vec3(-1.537383f,  1.875968f, -0.203977f),
+    vec3(-0.498611f,  0.041555f,  1.056972f)
+);
 
 const mat3 nbl_glsl_XYZtosRGB = nbl_glsl_XYZtoscRGB;
 
 const mat3 nbl_glsl_XYZtoBT709 = nbl_glsl_XYZtoscRGB;
 
 
-const mat3 nbl_glsl_XYZtoDisplay_P3 = mat3( vec3( 2.4934969,-0.8294890, 0.0358458),
-                                            vec3(-0.9313836, 1.7626641,-0.0761724),
-                                            vec3(-0.4027108, 0.0236247, 0.9568845));
+const mat3 nbl_glsl_XYZtoDisplay_P3 = mat3(
+    vec3( 2.4934969119f,-0.8294889696f, 0.0358458302f),
+    vec3(-0.9313836179f, 1.7626640603f,-0.0761723893f),
+    vec3(-0.4027107845f, 0.0236246858f, 0.9568845240f)
+);
 
 
-const mat3 nbl_glsl_XYZtoDCI_P3 = mat3(vec3(1.0,0.0,0.0),vec3(0.0,1.0,0.0),vec3(0.0,0.0,1.0));
+const mat3 nbl_glsl_XYZtoDCI_P3 = mat3(
+    vec3(1.0f,0.0f,0.0f),
+    vec3(0.0f,1.0f,0.0f),
+    vec3(0.0f,0.0f,1.0f)
+);
 
 
-const mat3 nbl_glsl_XYZtoBT2020 = mat3( vec3( 1.7166512,-0.6666844, 0.0176399),
-                                        vec3(-0.3556708, 1.6164812,-0.0427706),
-                                        vec3(-0.2533663, 0.0157685, 0.9421031));
+const mat3 nbl_glsl_XYZtoBT2020 = mat3(
+    vec3( 1.716651f,-0.666684f, 0.017640f),
+    vec3(-0.355671f, 1.616481f,-0.042771f),
+    vec3(-0.253366f, 0.015769f, 0.942103f)
+);
 
 const mat3 nbl_glsl_XYZtoHDR10_ST2084 = nbl_glsl_XYZtoBT2020;
 
@@ -33,19 +43,25 @@ const mat3 nbl_glsl_XYZtoDOLBYIVISION = nbl_glsl_XYZtoBT2020;
 const mat3 nbl_glsl_XYZtoHDR10_HLG = nbl_glsl_XYZtoBT2020;
 
 
-const mat3 nbl_glsl_XYZtoAdobeRGB = mat3(   vec3( 2.04159,-0.96924, 0.01344),
-                                            vec3(-0.56501, 1.87597,-0.11836),
-                                            vec3(-0.34473, 0.04156, 1.01517));
+const mat3 nbl_glsl_XYZtoAdobeRGB = mat3(
+    vec3( 2.0415879038f,-0.9692436363f, 0.0134442806f),
+    vec3(-0.5650069743f, 1.8759675015f,-0.1183623922f),
+    vec3(-0.3447313508f, 0.0415550574f, 1.0151749944f)
+);
 
 
-const mat3 nbl_glsl_XYZtoACES2065_1 = mat3( vec3( 1.0498110175, 0.0000000000,-0.0000974845),
-                                            vec3(-0.4959030231, 1.3733130458, 0.0982400361),
-                                            vec3( 0.0000000000, 0.0000000000, 0.9912520182));
+const mat3 nbl_glsl_XYZtoACES2065_1 = mat3(
+    vec3( 1.0498110175f, -0.4959030231f, 0.0000000000f),
+    vec3( 0.0000000000f,  1.3733130458f, 0.0000000000f),
+    vec3(-0.0000974845f,  0.0982400361f, 0.9912520182f)
+);
 
 
-const mat3 nbl_glsl_XYZtoACEScc = mat3( vec3( 1.6410234,-0.6636629, 0.0117219),
-                                        vec3(-0.3248033, 1.6153316,-0.0082844),
-                                        vec3(-0.2364247, 0.0167563, 0.9883949));
+const mat3 nbl_glsl_XYZtoACEScc = mat3(
+    vec3( 1.6410233797f,-0.6636628587f, 0.0117218943f),
+    vec3(-0.3248032942f, 1.6153315917f,-0.0082844420f),
+    vec3(-0.2364246952f, 0.0167563477f, 0.9883948585f)
+);
 
 const mat3 nbl_glsl_XYZtoACEScct = nbl_glsl_XYZtoACEScc;
 

include/nbl/builtin/glsl/colorspace/decodeCIEXYZ.glsl

@@ -6,9 +6,9 @@
 #define _NBL_BUILTIN_GLSL_COLOR_SPACE_ENCODE_CIE_XYZ_INCLUDED_
 
 const mat3 nbl_glsl_scRGBtoXYZ = mat3(
-    vec3(0.4124564, 0.2126729, 0.0193339),
-    vec3(0.3575761, 0.7151522, 0.1191920),
-    vec3(0.1804375, 0.0721750, 0.9503041)
+    vec3(0.412391f, 0.212639f, 0.019331f),
+    vec3(0.357584f, 0.715169f, 0.119195f),
+    vec3(0.180481f, 0.072192f, 0.950532f)
 );
 
 const mat3 nbl_glsl_sRGBtoXYZ = nbl_glsl_scRGBtoXYZ;
@@ -17,23 +17,23 @@ const mat3 nbl_glsl_BT709toXYZ = nbl_glsl_scRGBtoXYZ;
 
 
 const mat3 nbl_glsl_Display_P3toXYZ = mat3(
-    vec3(0.4865709, 0.2289746, 0.0000000),
-    vec3(0.2656677, 0.6917385, 0.0451134),
-    vec3(0.1982173, 0.0792869, 1.0439444)
+    vec3(0.4865709486f, 0.2289745641f, 0.0000000000f),
+    vec3(0.2656676932f, 0.6917385218f, 0.0451133819f),
+    vec3(0.1982172852f, 0.0792869141f, 1.0439443689f)
 );
 
 
 const mat3 nbl_glsl_DCI_P3toXYZ = mat3(
-    vec3(1.0, 0.0, 0.0),
-    vec3(0.0, 1.0, 0.0),
-    vec3(0.0, 0.0, 1.0)
+    vec3(1.0f, 0.0f, 0.0f),
+    vec3(0.0f, 1.0f, 0.0f),
+    vec3(0.0f, 0.0f, 1.0f)
 );
 
 
 const mat3 nbl_glsl_BT2020toXYZ = mat3(
-    vec3(0.6369580, 0.2627002, 0.0000000),
-    vec3(0.1446169, 0.6779981, 0.0280727),
-    vec3(0.1688810, 0.0593017, 1.0609851)
+    vec3(0.636958f, 0.262700f, 0.000000f),
+    vec3(0.144617f, 0.677998f, 0.028073f),
+    vec3(0.168881f, 0.059302f, 1.060985f)
 );
 
 const mat3 nbl_glsl_HDR10_ST2084toXYZ = nbl_glsl_BT2020toXYZ;
@@ -44,23 +44,23 @@ const mat3 nbl_glsl_HDR10_HLGtoXYZ = nbl_glsl_BT2020toXYZ;
 
 
 const mat3 nbl_glsl_AdobeRGBtoXYZ = mat3(
-    vec3(0.57667, 0.29734, 0.02703),
-    vec3(0.18556, 0.62736, 0.07069),
-    vec3(0.18823, 0.07529, 0.99134)
+    vec3(0.5766690429f, 0.2973449753f, 0.0270313614f),
+    vec3(0.1855582379f, 0.6273635663f, 0.0706888525f),
+    vec3(0.1882286462f, 0.0752914585f, 0.9913375368f)
 );
 
 
 const mat3 nbl_glsl_ACES2065_1toXYZ = mat3(
-    vec3(0.9525523959, 0.3439664498, 0.0000000000),
-    vec3(0.0000000000, 0.7281660966, 0.0000000000),
-    vec3(0.0000936786, -0.0721325464, 1.0088251844)
+    vec3(0.9525523959f,  0.3439664498f, 0.0000000000f),
+    vec3(0.0000000000f,  0.7281660966f, 0.0000000000f),
+    vec3(0.0000936786f, -0.0721325464f, 1.0088251844f)
 );
 
 
 const mat3 nbl_glsl_ACEScctoXYZ = mat3(
-    vec3(0.6624542, 0.2722287, -0.0055746),
-    vec3(0.1340042, 0.6740818, 0.6740818),
-    vec3(0.1561877, 0.0536895, 1.0103391)
+    vec3(0.6624541811f, 0.2722287168f, -0.0055746495f),
+    vec3(0.1340042065f, 0.6740817658f,  0.0040607335f),
+    vec3(0.1561876870f, 0.0536895174f,  1.0103391003f)
 );
 
 const mat3 nbl_glsl_ACESccttoXYZ = nbl_glsl_ACEScctoXYZ;

include/nbl/builtin/glsl/colorspace/encodeCIEXYZ.glsl

@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_BARYCENTRIC_UTILS_INCLUDED_
 #define _NBL_BUILTIN_HLSL_BARYCENTRIC_UTILS_INCLUDED_
 
-#include <nbl/builtin/hlsl/cpp_compat/cpp_compat.hlsl>
+#include <nbl/builtin/hlsl/cpp_compat.hlsl>
 
 namespace nbl
 {
@@ -13,27 +13,27 @@ namespace hlsl
 namespace barycentric
 {
 
-float2 reconstructBarycentrics(NBL_CONST_REF_ARG(float3) positionRelativeToV0, NBL_CONST_REF_ARG(float2x3) edges)
+float32_t2 reconstructBarycentrics(NBL_CONST_REF_ARG(float32_t3) positionRelativeToV0, NBL_CONST_REF_ARG(float32_t2x3) edges)
 {
-    const float e0_2 = dot(edges[0], edges[0]);
-    const float e0e1 = dot(edges[0], edges[1]);
-    const float e1_2 = dot(edges[1], edges[1]);
+    const float32_t e0_2 = dot(edges[0], edges[0]);
+    const float32_t e0e1 = dot(edges[0], edges[1]);
+    const float32_t e1_2 = dot(edges[1], edges[1]);
 
-    const float qe0 = dot(positionRelativeToV0, edges[0]);
-    const float qe1 = dot(positionRelativeToV0, edges[1]);
-    const float2 protoBary = float2(qe0 * e1_2 - qe1 * e0e1, qe1 * e0_2 - qe0 * e0e1);
+    const float32_t qe0 = dot(positionRelativeToV0, edges[0]);
+    const float32_t qe1 = dot(positionRelativeToV0, edges[1]);
+    const float32_t2 protoBary = float32_t2(qe0 * e1_2 - qe1 * e0e1, qe1 * e0_2 - qe0 * e0e1);
 
-    const float rcp_dep = 1.f / (e0_2 * e1_2 - e0e1 * e0e1);
+    const float32_t rcp_dep = 1.f / (e0_2 * e1_2 - e0e1 * e0e1);
     return protoBary * rcp_dep;
 }
-float2 reconstructBarycentrics(NBL_CONST_REF_ARG(float3) pointPosition, NBL_CONST_REF_ARG(float3x3) vertexPositions)
+float32_t2 reconstructBarycentrics(NBL_CONST_REF_ARG(float32_t3) pointPosition, NBL_CONST_REF_ARG(float32_t3x3) vertexPositions)
 {
-    return reconstructBarycentrics(pointPosition - vertexPositions[2], float2x3(vertexPositions[0] - vertexPositions[2], vertexPositions[1] - vertexPositions[2]));
+    return reconstructBarycentrics(pointPosition - vertexPositions[2], float32_t2x3(vertexPositions[0] - vertexPositions[2], vertexPositions[1] - vertexPositions[2]));
 }
 
-float3 expand(NBL_CONST_REF_ARG(float2) compactBarycentrics)
+float32_t3 expand(NBL_CONST_REF_ARG(float32_t2) compactBarycentrics)
 {
-    return float3(compactBarycentrics.xy,1.f-compactBarycentrics.x-compactBarycentrics.y);
+    return float32_t3(compactBarycentrics.xy,1.f-compactBarycentrics.x-compactBarycentrics.y);
 }
 
 }