Apply PR Reviews

Author: deprilula28

include/nbl/asset/utils/IShaderCompiler.h

@@ -136,7 +136,6 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 		{
 			IShader::E_SHADER_STAGE stage = IShader::E_SHADER_STAGE::ESS_UNKNOWN;
 			E_SPIRV_VERSION targetSpirvVersion = E_SPIRV_VERSION::ESV_1_6;
-			std::string_view entryPoint = "";
 			const ISPIRVOptimizer* spirvOptimizer = nullptr;
 			bool genDebugInfo = true;
 			SPreprocessorOptions preprocessorOptions = {};

src/nbl/asset/utils/CGLSLCompiler.cpp

@@ -143,12 +143,6 @@ core::smart_refctd_ptr<ICPUShader> CGLSLCompiler::compileToSPIRV(const char* cod
         return nullptr;
     }
 
-    if (glslOptions.entryPoint.compare("main") != 0)
-    {
-        glslOptions.preprocessorOptions.logger.log("shaderc requires entry point to be \"main\" in GLSL", system::ILogger::ELL_ERROR);
-        return nullptr;
-    }
-
     auto newCode = preprocessShader(code, glslOptions.stage, glslOptions.preprocessorOptions);
 
     shaderc::Compiler comp;
@@ -158,7 +152,7 @@ core::smart_refctd_ptr<ICPUShader> CGLSLCompiler::compileToSPIRV(const char* cod
     if (glslOptions.genDebugInfo)
         shadercOptions.SetGenerateDebugInfo();
 
-    shaderc::SpvCompilationResult bin_res = comp.CompileGlslToSpv(newCode.c_str(), newCode.size(), stage, glslOptions.preprocessorOptions.sourceIdentifier.data() ? glslOptions.preprocessorOptions.sourceIdentifier.data() : "", glslOptions.entryPoint.data(), shadercOptions);
+    shaderc::SpvCompilationResult bin_res = comp.CompileGlslToSpv(newCode.c_str(), newCode.size(), stage, glslOptions.preprocessorOptions.sourceIdentifier.data() ? glslOptions.preprocessorOptions.sourceIdentifier.data() : "", "main", shadercOptions);
 
     if (bin_res.GetCompilationStatus() == shaderc_compilation_status_success)
     {

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -68,7 +68,7 @@ static tcpp::IInputStream* getInputStreamInclude(
         res_str = _inclFinder->getIncludeStandard(relDir, _requesting_source);
 
     if (!res_str.size()) {
-        return nullptr;
+        return new tcpp::StringInputStream("#error File not found");
     }
 
     IShaderCompiler::disableAllDirectivesExceptIncludes(res_str);
@@ -289,11 +289,12 @@ core::smart_refctd_ptr<ICPUShader> CHLSLCompiler::compileToSPIRV(const char* cod
 
         // These are debug only
         L"-Zi", // Enables debug information
-        L"-Qembed_debug" //Embeds debug information
+        L"-Qembed_debug", //Embeds debug information
+        L"-fspv-debug=file" // Embeds debug information
     };
 
     const uint32_t nonDebugArgs = 5;
-    const uint32_t allArgs = nonDebugArgs + 2;
+    const uint32_t allArgs = nonDebugArgs + 3;
 
     auto compileResult = dxcCompile(this, newCode, &arguments[0], hlslOptions.genDebugInfo ? allArgs : nonDebugArgs, hlslOptions);
 

src/nbl/video/CVulkanLogicalDevice.h

@@ -536,7 +536,6 @@ class CVulkanLogicalDevice final : public ILogicalDevice
             commonCompileOptions.preprocessorOptions.extraDefines = getExtraShaderDefines();
 
             commonCompileOptions.stage = shaderStage;
-            commonCompileOptions.entryPoint = entryPoint;
             commonCompileOptions.genDebugInfo = true;
             commonCompileOptions.spirvOptimizer = nullptr; // TODO: create/get spirv optimizer in logical device?
             commonCompileOptions.targetSpirvVersion = m_physicalDevice->getLimits().spirvVersion;