almost done with the compilerSet

Author: Erfan-Ahmadi

include/nbl/asset/utils/CCompilerSet.h

@@ -19,7 +19,7 @@ namespace nbl::asset
 			, m_GLSLCompiler(core::make_smart_refctd_ptr<CGLSLCompiler>(core::smart_refctd_ptr(sys)))
 		{}
 
-		core::smart_refctd_ptr<ICPUBuffer> compileToSPIRV(core::smart_refctd_ptr<asset::ICPUShader> shader, const IShaderCompiler::SOptions& options);
+		core::smart_refctd_ptr<ICPUBuffer> compileToSPIRV(const asset::ICPUShader* shader, const IShaderCompiler::SOptions& options);
 
 		inline core::smart_refctd_ptr<IShaderCompiler> getShaderCompiler(IShader::E_CONTENT_TYPE contentType) const
 		{

src/nbl/asset/utils/CCompilerSet.cpp

@@ -6,7 +6,7 @@
 using namespace nbl;
 using namespace nbl::asset;
 
-core::smart_refctd_ptr<ICPUBuffer> CCompilerSet::compileToSPIRV(core::smart_refctd_ptr<asset::ICPUShader> shader, const IShaderCompiler::SOptions& options)
+core::smart_refctd_ptr<ICPUBuffer> CCompilerSet::compileToSPIRV(const asset::ICPUShader* shader, const IShaderCompiler::SOptions& options)
 {
 	core::smart_refctd_ptr<ICPUBuffer> outSpirvShader;
 	if (shader)

src/nbl/asset/utils/CShaderIntrospector.cpp

@@ -101,24 +101,29 @@ const CIntrospectionData* CShaderIntrospector::introspect(const ICPUShader* _sha
         return m_introspectionCache[std::move(key)].insert({core::smart_refctd_ptr<const ICPUShader>(_shader),std::move(introspection)}).first->second.get();
     };
 
-    // TODO: Use the compilerSet here to also take care of HLSL
-    if (_shader->getContentType() == ICPUShader::E_CONTENT_TYPE::ECT_GLSL)
+    auto begin = reinterpret_cast<const char*>(_shader->getContent()->getPointer());
+    auto end = begin + _shader->getContent()->getSize();
+    std::string code(begin, end);
+    if (_shader->getContentType() != ICPUShader::E_CONTENT_TYPE::ECT_SPIRV)
+        ICPUShader::insertDefines(code, _params.extraDefines);
+
+    // TODO:
+    core::smart_refctd_ptr<asset::CCompilerSet> compilerSet;
+
+    auto compiler = compilerSet->getShaderCompiler(_shader->getContentType());
+    asset::IShaderCompiler::SOptions commonCompileOptions = {};
+    commonCompileOptions.logger = nullptr;
+    commonCompileOptions.includeFinder = compiler->getDefaultIncludeFinder(); // to resolve includes before compilation
+    commonCompileOptions.stage = _shader->getStage();
+    commonCompileOptions.sourceIdentifier = _shader->getFilepathHint().c_str();
+    commonCompileOptions.entryPoint = _params.entryPoint;
+    commonCompileOptions.genDebugInfo = true;
+    commonCompileOptions.spirvOptimizer = nullptr; // No need of optimizing for introspection
+
+    if (_shader->getContentType() == ICPUShader::E_CONTENT_TYPE::ECT_GLSL || _shader->getContentType() == ICPUShader::E_CONTENT_TYPE::ECT_HLSL)
     {
-        auto begin = reinterpret_cast<const char*>(_shader->getContent()->getPointer());
-        auto end = begin+_shader->getContent()->getSize();
-        std::string glsl(begin,end);
-        ICPUShader::insertDefines(glsl,_params.extraDefines);
-        auto glslShader_woIncludes = m_glslCompiler->resolveIncludeDirectives(glsl.c_str(), _shader->getStage(), _shader->getFilepathHint().c_str());
-        auto spvShader = m_glslCompiler->createSPIRVFromGLSL(
-            reinterpret_cast<const char*>(glslShader_woIncludes->getContent()->getPointer()),
-            glslShader_woIncludes->getStage(),
-            _params.entryPoint,
-            glslShader_woIncludes->getFilepathHint().c_str()
-        );
-        if (!spvShader)
-            return nullptr;
-
-        return introspectSPV(spvShader.get());
+        // TODO: actually use code to create a ICPUShader or change the function signature for "compilerSet"
+        compilerSet->compileToSPIRV(_shader, commonCompileOptions);
     }
     else if (_shader->getContentType() == ICPUShader::E_CONTENT_TYPE::ECT_SPIRV)
         return introspectSPV(_shader);

src/nbl/video/CVulkanLogicalDevice.h

@@ -539,12 +539,13 @@ class CVulkanLogicalDevice final : public ILogicalDevice
 
         if (cpushader->getContentType() == asset::ICPUShader::E_CONTENT_TYPE::ECT_HLSL)
         {
+            // TODO: actually use code to create a ICPUShader (via non allocating CPUBuffer) or change the function signature for "compilerSet"
             // TODO: add specific HLSLCompiler::SOption params
-            spirv = compilerSet->compileToSPIRV(cpushader, commonCompileOptions);
+            spirv = compilerSet->compileToSPIRV(cpushader.get(), commonCompileOptions);
         }
         else if (cpushader->getContentType() == asset::ICPUShader::E_CONTENT_TYPE::ECT_GLSL)
         {
-            spirv = compilerSet->compileToSPIRV(cpushader, commonCompileOptions);
+            spirv = compilerSet->compileToSPIRV(cpushader.get(), commonCompileOptions);
         }
         else if (cpushader->getContentType() == asset::ICPUShader::E_CONTENT_TYPE::ECT_SPIRV)
         {