Merge branch 'master' into more_fft_utils

Author: Fletterio

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
@@ -471,7 +466,6 @@ set(NBL_3RDPARTY_TARGETS
 				simdjson
 				nlohmann_json
 				glslang
-				OGLCompiler 
 				OSDependent
 				MachineIndependent
 				GenericCodeGen
@@ -497,9 +491,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/glslang

@@ -27,7 +27,7 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
     public:
         struct SCreationParams : asset::IBuffer::SCreationParams
         {
-            size_t size;
+            size_t size; // WHY IS THIS SHADOWING THE `asset::IBuffer::SCreationParams` !?
             void* data = nullptr;
             size_t alignment = _NBL_SIMD_ALIGNMENT;
             core::smart_refctd_ptr<core::refctd_memory_resource> memoryResource = nullptr;

3rdparty/shaderc

@@ -712,7 +712,6 @@ if(NBL_STATIC_BUILD)
 	nbl_install_lib(glslang)
 	nbl_install_lib(GenericCodeGen)
 	nbl_install_lib(MachineIndependent)
-	nbl_install_lib(HLSL)
 	nbl_install_lib(jpeg-static)
 	if (_NBL_COMPILE_WITH_OPEN_EXR_)
 		nbl_install_lib(OpenEXR)
@@ -726,7 +725,6 @@ if(NBL_STATIC_BUILD)
 	nbl_install_lib(SPIRV)
 	nbl_install_lib(SPIRV-Tools-static) # TODO: make this function/macro work with alias target
 	nbl_install_lib(SPIRV-Tools-opt)
-	nbl_install_lib(OGLCompiler)
 	nbl_install_lib(OSDependent)
 	nbl_install_lib(zlibstatic)
 	nbl_install_lib(simdjson)

include/nbl/asset/ICPUBuffer.h

@@ -103,9 +103,9 @@ namespace nbl::asset::impl
             {
                 auto res_str = std::move(result.contents);
                 //employ encloseWithinExtraInclGuards() in order to prevent infinite loop of (not necesarilly direct) self-inclusions while other # directives (incl guards among them) are disabled
-                CGLSLCompiler::disableAllDirectivesExceptIncludes(res_str);
-                disableGlDirectives(res_str);
-                res_str = CGLSLCompiler::encloseWithinExtraInclGuards(std::move(res_str), m_maxInclCnt, name.string().c_str());
+                //CGLSLCompiler::disableAllDirectivesExceptIncludes(res_str);
+                //disableGlDirectives(res_str);
+                //res_str = CGLSLCompiler::encloseWithinExtraInclGuards(std::move(res_str), m_maxInclCnt, name.string().c_str());
 
                 res->content_length = res_str.size();
                 res->content = new char[res_str.size() + 1u];
@@ -145,8 +145,8 @@ std::string CGLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE
             insertion << "#define " << define.identifier << " " << define.definition << "\n";
         insertIntoStart(code,std::move(insertion));
     }
-    disableAllDirectivesExceptIncludes(code);
-    disableGlDirectives(code);
+    //disableAllDirectivesExceptIncludes(code);
+    //disableGlDirectives(code);
     shaderc::Compiler comp;
     shaderc::CompileOptions options;
     options.SetTargetSpirv(shaderc_spirv_version_1_6);
@@ -164,8 +164,8 @@ std::string CGLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE
     }
 
     auto resolvedString = std::string(res.cbegin(), std::distance(res.cbegin(), res.cend()));
-    reenableDirectives(resolvedString);
-    reenableGlDirectives(resolvedString);
+    //reenableDirectives(resolvedString);
+    //reenableGlDirectives(resolvedString);
     return resolvedString;
 }
 

src/nbl/CMakeLists.txt

@@ -1703,13 +1703,14 @@ class GetDependantVisit<ICPUDescriptorSet> : public GetDependantVisitBase<ICPUDe
 					outInfo.info.buffer.size = std::get<0>(argTuple).size;
 				}
 			}
-			if constexpr (std::is_same_v<DepType,ICPUImage>)
+			if constexpr (std::is_same_v<DepType,ICPUImageView>)
 			{
 				outInfo.info.image.imageLayout = std::get<0>(argTuple);
 				if (type==IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER)
 				{
 					assert(lastCombinedSampler);
-					outInfo.info.combinedImageSampler = std::get<1>(argTuple);
+					outInfo.info.combinedImageSampler.sampler = smart_refctd_ptr<IGPUSampler>(lastCombinedSampler);
+					lastCombinedSampler = nullptr; // for debuggability
 				}
 			}
 			return true;