diff options
author | 2019-11-24 15:40:14 +0100 | |
---|---|---|
committer | 2019-11-24 15:40:28 +0100 | |
commit | 4cccc0183cef3dc959500d708256d18a98a62c46 (patch) | |
tree | 0c982d0df6032ded138b018070c52868b2df5e59 /src/osd/modules/render/bgfx/chainentryreader.cpp | |
parent | 19a09406a63005cc470695684a57a6e4e36196cb (diff) |
-bgfx: Fixed Github issues #5830 and #5956. [Ryan Holtz]
Diffstat (limited to 'src/osd/modules/render/bgfx/chainentryreader.cpp')
-rw-r--r-- | src/osd/modules/render/bgfx/chainentryreader.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/osd/modules/render/bgfx/chainentryreader.cpp b/src/osd/modules/render/bgfx/chainentryreader.cpp index d48b214f83d..f14d9d76f64 100644 --- a/src/osd/modules/render/bgfx/chainentryreader.cpp +++ b/src/osd/modules/render/bgfx/chainentryreader.cpp @@ -183,6 +183,10 @@ bgfx_chain_entry* chain_entry_reader::read_from_value(const Value& value, std::s } } + // Parse whether or not to apply screen tint in this pass + bool applytint = get_bool(value, "applytint", false); + + // Parse uniforms std::vector<bgfx_entry_uniform*> uniforms; if (value.HasMember("uniforms")) { @@ -228,7 +232,7 @@ bgfx_chain_entry* chain_entry_reader::read_from_value(const Value& value, std::s } std::string output = value["output"].GetString(); - return new bgfx_chain_entry(name, effect, clear, suppressors, inputs, uniforms, chains.targets(), output); + return new bgfx_chain_entry(name, effect, clear, suppressors, inputs, uniforms, chains.targets(), output, applytint); } bool chain_entry_reader::validate_parameters(const Value& value, std::string prefix) @@ -242,5 +246,6 @@ bool chain_entry_reader::validate_parameters(const Value& value, std::string pre if (!READER_CHECK(!value.HasMember("input") || value["input"].IsArray(), (prefix + "Value 'input' must be an array\n").c_str())) return false; if (!READER_CHECK(!value.HasMember("uniforms") || value["uniforms"].IsArray(), (prefix + "Value 'uniforms' must be an array\n").c_str())) return false; if (!READER_CHECK(!value.HasMember("disablewhen") || value["disablewhen"].IsArray(), (prefix + "Value 'disablewhen' must be an array\n").c_str())) return false; + if (!READER_CHECK(!value.HasMember("applytint") || value["applytint"].IsBool(), (prefix + "Value 'applytint' must be a bool\n").c_str())) return false; return true; } |