summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/bgfx/chainentryreader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/render/bgfx/chainentryreader.cpp')
-rw-r--r--src/osd/modules/render/bgfx/chainentryreader.cpp45
1 files changed, 23 insertions, 22 deletions
diff --git a/src/osd/modules/render/bgfx/chainentryreader.cpp b/src/osd/modules/render/bgfx/chainentryreader.cpp
index 5c6d73e2ce9..de3471a4449 100644
--- a/src/osd/modules/render/bgfx/chainentryreader.cpp
+++ b/src/osd/modules/render/bgfx/chainentryreader.cpp
@@ -27,20 +27,25 @@
#include "suppressor.h"
#include "suppressorreader.h"
-bgfx_chain_entry* chain_entry_reader::read_from_value(const Value& value, osd_options& options, texture_manager& textures, target_manager& targets, effect_manager& effects, std::map<std::string, bgfx_slider*>& sliders, std::map<std::string, bgfx_parameter*>& params)
+bgfx_chain_entry* chain_entry_reader::read_from_value(const Value& value, std::string prefix, osd_options& options, texture_manager& textures, target_manager& targets, effect_manager& effects, std::map<std::string, bgfx_slider*>& sliders, std::map<std::string, bgfx_parameter*>& params)
{
- validate_parameters(value);
+ validate_parameters(value, prefix);
bgfx_effect* effect = effects.effect(value["effect"].GetString());
+ std::string name = value["name"].GetString();
std::vector<bgfx_input_pair> inputs;
if (value.HasMember("input"))
{
- assert(value["input"].IsArray());
+ READER_ASSERT(value["input"].IsArray(), (prefix + "Chain entry '" + name + "': value 'input' must be an array\n").c_str());
const Value& input_array = value["input"];
for (UINT32 i = 0; i < input_array.Size(); i++)
{
- std::string sampler = input_array[i]["sampler"].GetString();
+ READER_ASSERT(input_array[i].HasMember("sampler"), (prefix + "input[" + std::to_string(i) + ": Must have string value 'sampler' (what sampler are we binding to?)\n").c_str());
+ READER_ASSERT(input_array[i]["sampler"].IsString(), (prefix + "input[" + std::to_string(i) + ": Value 'sampler' must be a string\n").c_str());
+ READER_ASSERT(input_array[i].HasMember("texture"), (prefix + "input[" + std::to_string(i) + ": Must have string value 'texture' (what texture are we using?)\n").c_str());
+ READER_ASSERT(input_array[i]["texture"].IsString(), (prefix + "input[" + std::to_string(i) + ": Value 'texture' must be a string\n").c_str());
+ std::string sampler = input_array[i]["sampler"].GetString();
std::string texture = input_array[i]["texture"].GetString();
inputs.push_back(bgfx_input_pair(i, sampler, texture));
}
@@ -49,28 +54,28 @@ bgfx_chain_entry* chain_entry_reader::read_from_value(const Value& value, osd_op
std::vector<bgfx_entry_uniform*> uniforms;
if (value.HasMember("uniforms"))
{
- assert(value["uniforms"].IsArray());
+ READER_ASSERT(value["uniforms"].IsArray(), (prefix + "Chain entry '" + name + "': value 'uniforms' must be an array\n").c_str());
const Value& uniform_array = value["uniforms"];
for (UINT32 i = 0; i < uniform_array.Size(); i++)
{
- uniforms.push_back(entry_uniform_reader::read_from_value(uniform_array[i], effect, sliders, params));
+ uniforms.push_back(entry_uniform_reader::read_from_value(uniform_array[i], prefix + "uniforms[" + std::to_string(i) + "]: ", effect, sliders, params));
}
}
std::vector<bgfx_suppressor*> suppressors;
if (value.HasMember("disablewhen"))
{
- assert(value["disablewhen"].IsArray());
+ READER_ASSERT(value["disablewhen"].IsArray(), (prefix + "Chain entry '" + name + "': value 'disablewhen' must be an array\n").c_str());
const Value& suppressor_array = value["disablewhen"];
for (UINT32 i = 0; i < suppressor_array.Size(); i++)
{
- suppressors.push_back(suppressor_reader::read_from_value(suppressor_array[i], sliders));
+ suppressors.push_back(suppressor_reader::read_from_value(suppressor_array[i], prefix, sliders));
}
}
if (value.HasMember("textures"))
{
- assert(value["textures"].IsArray());
+ READER_ASSERT(value["textures"].IsArray(), (prefix + "Chain entry '" + name + "': value 'textures' must be an array\n").c_str());
const Value& texture_array = value["textures"];
for (UINT32 i = 0; i < texture_array.Size(); i++)
{
@@ -84,24 +89,20 @@ bgfx_chain_entry* chain_entry_reader::read_from_value(const Value& value, osd_op
std::string output_name = value["output"].GetString();
if (output_name != std::string("backbuffer"))
{
- return new bgfx_chain_entry(value["name"].GetString(), effect, suppressors, inputs, uniforms, targets, output_name);
+ return new bgfx_chain_entry(name, effect, suppressors, inputs, uniforms, targets, output_name);
}
else
{
- return new bgfx_chain_entry(value["name"].GetString(), effect, suppressors, inputs, uniforms, targets, "none");
+ return new bgfx_chain_entry(name, effect, suppressors, inputs, uniforms, targets, "none");
}
}
-void chain_entry_reader::validate_parameters(const Value& value)
+void chain_entry_reader::validate_parameters(const Value& value, std::string prefix)
{
- assert(value.HasMember("effect"));
- assert(value["effect"].IsString());
- if (value.HasMember("name"))
- {
- assert(value["name"].IsString());
- }
- assert(value.HasMember("effect"));
- assert(value["effect"].IsString());
- assert(value.HasMember("output"));
- assert(value["output"].IsString());
+ READER_ASSERT(value.HasMember("effect"), (prefix + "Must have string value 'effect' (what effect does this entry use?)\n").c_str());
+ READER_ASSERT(value["effect"].IsString(), (prefix + "Value 'effect' must be a string\n").c_str());
+ READER_ASSERT(value.HasMember("name"), (prefix + "Must have string value 'effect' (what effect does this entry use?)\n").c_str());
+ READER_ASSERT(value["name"].IsString(), (prefix + "Value 'name' must be a string\n").c_str());
+ READER_ASSERT(value.HasMember("output"), (prefix + "Must have string value 'output' (what target contains the result of this entry?)\n").c_str());
+ READER_ASSERT(value["output"].IsString(), (prefix + "Value 'output' must be a string\n").c_str());
}