Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla into gpgpuimgui

Author: AnastaZIuk

3rdparty/CMakeLists.txt

@@ -202,6 +202,10 @@ option(_NBL_COMPILE_WITH_OPEN_EXR_ "Build with OpenEXR library" ON)
 # here is where _NBL_COMPILE_WITH_OPEN_EXR_ plays a role - when disabled OpenEXR won't be built and linked
 # but it's core 
 
+# for new build system it doesn't matter since we no more fetch content stuff, temporary to fix current master CMake clones
+set(OPENEXR_DEFLATE_REPO "[email protected]:ebiggers/libdeflate.git" CACHE STRING "Repo path for libdeflate source" FORCE)
+set(OPENEXR_IMATH_REPO "[email protected]:AcademySoftwareFoundation/Imath.git" CACHE STRING "Repo for auto-build of Imath" FORCE)
+
 set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
 set(_OLD_BUILD_TESTING ${BUILD_TESTING})

3rdparty/git-version-tracking

@@ -151,12 +151,12 @@ git clone [email protected]:Devsh-Graphics-Programming/Nabla.git <target directory>
 
 #### Force HTTPS protocol (optional)
 
-We support cloning Nabla with **ssh only**, however you can still force clone with https for whole repository and it's all submodules by overriding project git config setup.
+We support cloning Nabla with **ssh only**, however you can still clone Nabla and it's all submodules with https by overriding global git configuration (sorry, must be global for it to work, currently we don't have smart scripts to change local configuration for each nested submodule).
 
 ```powershell
 git init
-git config --project protocol.*.allow always
-git config --project url."https://github.com/".insteadOf "[email protected]:"
+git config --global protocol.*.allow always
+git config --global url."https://github.com/".insteadOf "[email protected]:"
 git remote add origin https://github.com/Devsh-Graphics-Programming/Nabla.git
 git fetch origin master
 git checkout master

README.md

@@ -361,6 +361,24 @@ complex_t<Scalar> polar(const Scalar r, const Scalar theta)
     return retVal;
 }
 
+
+// --------------------------------------------- Some more functions that come in handy --------------------------------------
+// Fast mul by i
+template<typename Scalar>
+complex_t<Scalar> rotateLeft(NBL_CONST_REF_ARG(complex_t<Scalar>) value)
+{
+    complex_t<Scalar> retVal = { -value.imag(), value.real() };
+    return retVal;
+}
+
+// Fast mul by -i
+template<typename Scalar>
+complex_t<Scalar> rotateRight(NBL_CONST_REF_ARG(complex_t<Scalar>) value)
+{
+    complex_t<Scalar> retVal = { value.imag(), -value.real() };
+    return retVal;
+}
+
 }
 }
 
@@ -378,23 +396,4 @@ NBL_REGISTER_OBJ_TYPE(complex_t<float64_t2>,::nbl::hlsl::alignment_of_v<float64_
 NBL_REGISTER_OBJ_TYPE(complex_t<float64_t3>,::nbl::hlsl::alignment_of_v<float64_t3>)
 NBL_REGISTER_OBJ_TYPE(complex_t<float64_t4>,::nbl::hlsl::alignment_of_v<float64_t4>)
 
-
-
---------------------------------------------- Some more functions that come in handy --------------------------------------
-// Fast mul by i
-template<typename Scalar>
-complex_t<Scalar> rotateLeft(NBL_CONST_REF_ARG(complex_t<Scalar>) value) 
-{
-    complex_t<Scalar> retVal = {- value.imag(), value.real()};
-    return retVal;
-}
-
-// Fast mul by -i
-template<typename Scalar>
-complex_t<Scalar> rotateRight(NBL_CONST_REF_ARG(complex_t<Scalar>) value) 
-{
-    complex_t<Scalar> retVal = {value.imag(), -value.real()};
-    return retVal;
-}
-
 #endif

include/nbl/builtin/hlsl/complex.hlsl

@@ -219,44 +219,16 @@ T bitfieldExtract( T val, uint32_t offsetBits, uint32_t numBits )
     return impl::bitfieldExtract<T, is_signed<T>::value, is_integral<T>::value>::__call(val,offsetBits,numBits);
 }
 
-namespace impl 
-{
-
-template<typename T>
-struct bitfieldInsert
-{
-    static T __call( T base, T insert, uint32_t offset, uint32_t count )
-    {
-        return spirv::bitFieldInsert<T>( base, insert, offset, count );
-    }
-};
-
-} //namespace impl
-
 template<typename T>
-T bitfieldInsert( T base, T insert, uint32_t offset, uint32_t bits )
+T bitfieldInsert(T base, T insert, uint32_t offset, uint32_t bits)
 {
-    return impl::bitfieldInsert<T>::__call(base, insert, offset, bits);
+    return spirv::bitFieldInsert<T>(base, insert, offset, bits);
 }
 
-namespace impl 
-{
-
-template<typename T>
-struct bitfieldReverse
-{
-    static T __call( T base )
-    {
-        return spirv::bitFieldReverse<T>( base );
-    }
-};
-
-} //namespace impl
-
 template<typename T>
-T bitfieldReverse( T value )
+T bitfieldReverse(T value)
 {
-    return impl::bitfieldReverse<T>::__call(value);
+    return spirv::bitFieldReverse<T>(value);
 }
 
 #endif

include/nbl/builtin/hlsl/glsl_compat/core.hlsl

@@ -0,0 +1,8 @@
+#if defined(NBL_LOG) || defined(NBL_LOG_ERROR)
+	#error redefinition of NBL_LOG/NBL_LOG_ERROR. did you forgot to undefine logging macros somewhere? #include "nbl/undefine_logging_macros.h"
+#elif !defined(_GIT_INFO_H_INCLUDED_)
+	#error logging macros require git meta info, include "git_info.h"
+#else
+	#define NBL_LOG(SEVERITY, FORMAT, ...) NBL_LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash, __FUNCTION__, __FILE__, __LINE__);
+	#define NBL_LOG_ERROR(FORMAT, ...) NBL_LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
+#endif

include/nbl/logging_macros.h

@@ -0,0 +1,3 @@
+#undef NBL_LOG
+#undef NBL_LOG_ERROR
+#undef NBL_LOG_FUNCTION