diff options
Diffstat (limited to 'src/osd/modules/render/bgfx/paramuniformreader.cpp')
-rw-r--r-- | src/osd/modules/render/bgfx/paramuniformreader.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/osd/modules/render/bgfx/paramuniformreader.cpp b/src/osd/modules/render/bgfx/paramuniformreader.cpp index d6941dd1ccc..704b79b204f 100644 --- a/src/osd/modules/render/bgfx/paramuniformreader.cpp +++ b/src/osd/modules/render/bgfx/paramuniformreader.cpp @@ -14,15 +14,19 @@ bgfx_entry_uniform* param_uniform_reader::read_from_value(const Value& value, std::string prefix, bgfx_uniform* uniform, std::map<std::string, bgfx_parameter*>& params) { - validate_parameters(value, prefix); + if (!validate_parameters(value, prefix)) + { + return nullptr; + } std::string parameter = value["parameter"].GetString(); return new bgfx_param_uniform(uniform, params[parameter]); } -void param_uniform_reader::validate_parameters(const Value& value, std::string prefix) +bool param_uniform_reader::validate_parameters(const Value& value, std::string prefix) { - READER_ASSERT(value.HasMember("parameter"), (prefix + "Must have string value 'parameter' (what parameter is being mapped?)\n").c_str()); - READER_ASSERT(value["parameter"].IsString(), (prefix + "Value 'parameter' must be a string\n").c_str()); + if (!READER_CHECK(value.HasMember("parameter"), (prefix + "Must have string value 'parameter' (what parameter is being mapped?)\n").c_str())) return false; + if (!READER_CHECK(value["parameter"].IsString(), (prefix + "Value 'parameter' must be a string\n").c_str())) return false; + return true; } |