fixup some IShaderCompiler::SOptions

Author: Erfan-Ahmadi

examples_tests

@@ -20,12 +20,7 @@ class NBL_API2 CGLSLCompiler final : public IShaderCompiler
 
 		struct SOptions : IShaderCompiler::SOptions
 		{
-			void setCommonData(const IShaderCompiler::SOptions& opt)
-			{
-				static_cast<IShaderCompiler::SOptions&>(*this) = opt;
-			}
-
-			virtual IShader::E_CONTENT_TYPE getCodeContentType() const override { return IShader::E_CONTENT_TYPE::ECT_GLSL; };
+			IShader::E_CONTENT_TYPE getCodeContentType() const override { return IShader::E_CONTENT_TYPE::ECT_GLSL; };
 		};
 
 		/**

include/nbl/asset/utils/CGLSLCompiler.h

@@ -21,13 +21,7 @@ class NBL_API2 CHLSLCompiler final : public IShaderCompiler
 		struct SOptions : IShaderCompiler::SOptions
 		{
 			// TODO: Add extra dxc options
-
-			void setCommonData(const IShaderCompiler::SOptions& opt)
-			{
-				static_cast<IShaderCompiler::SOptions&>(*this) = opt;
-			}
-
-			virtual IShader::E_CONTENT_TYPE getCodeContentType() const override { return IShader::E_CONTENT_TYPE::ECT_HLSL; };
+			IShader::E_CONTENT_TYPE getCodeContentType() const override { return IShader::E_CONTENT_TYPE::ECT_HLSL; };
 		};
 
 		core::smart_refctd_ptr<ICPUBuffer> compileToSPIRV(const char* code, const CHLSLCompiler::SOptions& options) const;
@@ -36,22 +30,17 @@ class NBL_API2 CHLSLCompiler final : public IShaderCompiler
 
 		core::smart_refctd_ptr<ICPUShader> createSPIRVShader(system::IFile* sourceFile, const CHLSLCompiler::SOptions& options) const;
 
-		/*
-		 If original code contains #version specifier,
-			then the filled fmt will be placed onto the next line after #version in the output buffer. If not, fmt will be placed into the
-			beginning of the output buffer.
-		*/
 		template<typename... Args>
 		static core::smart_refctd_ptr<ICPUShader> createOverridenCopy(const ICPUShader* original, const char* fmt, Args... args)
 		{
 			return IShaderCompiler::createOverridenCopy(original, 0u, fmt, args...);
 		}
 
-		static inline const char* getStorageImageFormatQualifier(const asset::E_FORMAT format)
-		{
-			// TODO
-			return "";
-		}
+		// TODO
+		//static inline const char* getStorageImageFormatQualifier(const asset::E_FORMAT format)
+		//{
+		//	return "";
+		//}
 };
 
 }

include/nbl/asset/utils/CHLSLCompiler.h

@@ -124,15 +124,20 @@ 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;
-			const char* entryPoint = nullptr;
-			const char* sourceIdentifier = nullptr;
+			std::string_view entryPoint = nullptr;
+			std::string_view sourceIdentifier = nullptr;
 			std::string* outAssembly = nullptr;
 			const ISPIRVOptimizer* spirvOptimizer = nullptr;
 			system::logger_opt_ptr logger = nullptr;
 			const CIncludeFinder* includeFinder = nullptr;
 			uint32_t maxSelfInclusionCount = 4u;
 			bool genDebugInfo = true;
 
+			void setCommonData(const SOptions& opt)
+			{
+				(*this) = opt;
+			}
+
 			virtual IShader::E_CONTENT_TYPE getCodeContentType() const { return IShader::E_CONTENT_TYPE::ECT_UNKNOWN; };
 		};