Fixed argument overriding mistake

Hazardu · Hazardu · commit f11ade6ac418 · 2024-02-01T17:28:56.000+01:00
diff --git a/src/nbl/asset/utils/CHLSLCompiler.cpp b/src/nbl/asset/utils/CHLSLCompiler.cpp
@@ -333,7 +333,7 @@ core::smart_refctd_ptr<ICPUShader> CHLSLCompiler::compileToSPIRV(const char* cod
     std::wstring targetProfile(SHADER_MODEL_PROFILE);
    
     std::vector<std::wstring> arguments = {};
-    if (dxc_compile_flags.size() || hlslOptions.dxcOptions.size()) { // #pragma dxc_compile_flags takes priority
+    if (dxc_compile_flags.size()) { // #pragma dxc_compile_flags takes priority
         populate_arguments_with_type_conversion(arguments, dxc_compile_flags, logger);
     }
     else if (hlslOptions.dxcOptions.size()) { // second in order of priority is command line arguments

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ core::smart_refctd_ptr<ICPUShader> CHLSLCompiler::compileToSPIRV(const char* cod`
`333`	`333`	`std::wstring targetProfile(SHADER_MODEL_PROFILE);`
`334`	`334`
`335`	`335`	`std::vector<std::wstring> arguments = {};`
`336`		`- if (dxc_compile_flags.size() \|\| hlslOptions.dxcOptions.size()) { // #pragma dxc_compile_flags takes priority`
	`336`	`+ if (dxc_compile_flags.size()) { // #pragma dxc_compile_flags takes priority`
`337`	`337`	`populate_arguments_with_type_conversion(arguments, dxc_compile_flags, logger);`
`338`	`338`	`}`
`339`	`339`	`else if (hlslOptions.dxcOptions.size()) { // second in order of priority is command line arguments`