Merge branch 'master' into ngfx-sdk-integration

Author: keptsecret

3rdparty/CMakeLists.txt

@@ -161,11 +161,6 @@ target_include_directories(SPIRV PUBLIC "${GLSLANG_GENERATED_INCLUDEDIR}")
 set(SHADERC_SKIP_TESTS ON CACHE INTERNAL "Skip shaderc tests?")
 set(SHADERC_SKIP_INSTALL ON CACHE INTERNAL "Install shaderc?")
 
-# if it doesn't work without the `touch` on Linux, then fetch the latest submodule head of shaderc and try again
-# https://github.com/google/shaderc/issues/568
-if (UNIX)
-	file(WRITE ${THIRD_PARTY_SOURCE_DIR}/shaderc/libshaderc/libshaderc_combined.a "")
-endif()
 add_subdirectory(shaderc shaderc EXCLUDE_FROM_ALL)
 
 # libjpeg-turbo
@@ -474,7 +469,6 @@ set(NBL_3RDPARTY_TARGETS
 				simdjson
 				nlohmann_json
 				glslang
-				OGLCompiler 
 				OSDependent
 				MachineIndependent
 				GenericCodeGen
@@ -500,9 +494,6 @@ endif()
 if (NBL_BUILD_IMGUI)
 	list(APPEND NBL_3RDPARTY_TARGETS imgui implot imtestsuite imtestengine imguizmo)
 endif()
-if(ENABLE_HLSL)
-	list(APPEND NBL_3RDPARTY_TARGETS HLSL)
-endif()
 
 foreach(trgt IN LISTS NBL_3RDPARTY_TARGETS)
 		if(NBL_DYNAMIC_MSVC_RUNTIME)

3rdparty/Vulkan-Headers

@@ -12,6 +12,8 @@ if(NBL_REQUEST_SSE_AXV2)
 	NBL_REQUEST_COMPILE_OPTION_SUPPORT("/arch:AVX2")
 endif()
 
+NBL_REQUEST_COMPILE_OPTION_SUPPORT(/Zc:preprocessor)
+
 # Debug
 set(NBL_C_DEBUG_COMPILE_OPTIONS
 	/Ob0 /Od /MP${_NBL_JOBS_AMOUNT_} /fp:fast /Zc:wchar_t /INCREMENTAL

3rdparty/dxc/dxc

@@ -203,16 +203,11 @@ class MonoDeviceApplication : public virtual MonoSystemMonoLoggerApplication
 		}
 
 		// These features are features you'll enable if present but won't interfere with your choice of device
-		// There's no intersection operator (yet) on the features, so its not used yet!
 		// virtual function so you can override as needed for some example father down the line
 		virtual video::SPhysicalDeviceFeatures getPreferredDeviceFeatures() const
 		{
 			video::SPhysicalDeviceFeatures retval = {};
 
-			/*retval.shaderFloat64 = true;
-			retval.shaderDrawParameters = true;
-			retval.drawIndirectCount = true;*/
-
 			return retval;
 		}
 

3rdparty/glslang

@@ -27,10 +27,9 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
     public:
         struct SCreationParams : asset::IBuffer::SCreationParams
         {
-            size_t size;
             void* data = nullptr;
-            size_t alignment = _NBL_SIMD_ALIGNMENT;
             core::smart_refctd_ptr<core::refctd_memory_resource> memoryResource = nullptr;
+            size_t alignment = _NBL_SIMD_ALIGNMENT;
 
             SCreationParams& operator =(const asset::IBuffer::SCreationParams& rhs)
             {
@@ -67,7 +66,7 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
 
         core::smart_refctd_ptr<IAsset> clone(uint32_t = ~0u) const override final
         {
-            auto cp = create({ .size = m_creationParams.size, .data = m_data, .alignment = m_alignment });
+            auto cp = create({ { m_creationParams.size }, m_data, nullptr, m_alignment });
             memcpy(cp->getPointer(), m_data, m_creationParams.size);
             cp->setContentHash(getContentHash());
             return cp;

3rdparty/shaderc

@@ -33,7 +33,7 @@ class ICPUShader : public IAsset, public IShader
 			: IShader(stage, std::move(filepathHint)), m_code(std::move(code)), m_contentType(contentType) {}
 
 		ICPUShader(const char* code, const E_SHADER_STAGE stage, const E_CONTENT_TYPE contentType, std::string&& filepathHint)
-			: ICPUShader(ICPUBuffer::create({ .size = strlen(code) + 1u }), stage, contentType, std::move(filepathHint))
+			: ICPUShader(ICPUBuffer::create({ strlen(code) + 1u }), stage, contentType, std::move(filepathHint))
 		{
 			assert(contentType != E_CONTENT_TYPE::ECT_SPIRV); // because using strlen needs `code` to be null-terminated
 			memcpy(m_code->getPointer(), code, m_code->getSize());