Merge pull request #6229 from aliaspider/master

(slang) slang_process: preset alias setting has higher priority.
This commit is contained in:
Twinaphex 2018-02-03 23:36:59 +01:00 committed by GitHub
commit 31a30f1496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -316,7 +316,7 @@ bool slang_process(
if (!slang_preprocess_parse_parameters(output.meta, shader_info))
return false;
if (!output.meta.name.empty())
if (!*pass.alias && !output.meta.name.empty())
strncpy(pass.alias, output.meta.name.c_str(), sizeof(pass.alias) - 1);
out->format = output.meta.rt_format;