summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/bgfx/depthreader.cpp
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-23 17:55:55 +0100
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-23 17:55:55 +0100
commitba0a1d8d5218804bc1d5b09d5b3fa8fcd537f0bf (patch)
tree9fe5ca6f9f6352f724ea9a26fff5ebda23576607 /src/osd/modules/render/bgfx/depthreader.cpp
parentd0867ac3f2bdcfd4d1d2361ce8b6408a185908f4 (diff)
parent5ed9f938ea322d386e949d2752892651d9ee9fde (diff)
Merge bgfx_shader into master, nw
Diffstat (limited to 'src/osd/modules/render/bgfx/depthreader.cpp')
-rw-r--r--src/osd/modules/render/bgfx/depthreader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/render/bgfx/depthreader.cpp b/src/osd/modules/render/bgfx/depthreader.cpp
index cdcfa1b2046..e904604b84d 100644
--- a/src/osd/modules/render/bgfx/depthreader.cpp
+++ b/src/osd/modules/render/bgfx/depthreader.cpp
@@ -21,13 +21,13 @@ const depth_reader::string_to_enum depth_reader::FUNCTION_NAMES[depth_reader::FU
{ "always", BGFX_STATE_DEPTH_TEST_ALWAYS }
};
-uint64_t depth_reader::read_from_value(const Value& value)
+uint64_t depth_reader::read_from_value(const Value& value, std::string prefix)
{
uint64_t write_enable = 0;
- if (value.HasMember("writeEnable"))
+ if (value.HasMember("writeenable"))
{
- assert(value["writeEnable"].IsBool());
- write_enable = value["writeEnable"].GetBool() ? BGFX_STATE_DEPTH_WRITE: 0;
+ if (!READER_CHECK(value["writeenable"].IsBool(), (prefix + "Value 'writeenable' must be a boolean\n").c_str())) return 0;
+ write_enable = value["writeenable"].GetBool() ? BGFX_STATE_DEPTH_WRITE: 0;
}
uint64_t function = get_enum_from_value(value, "function", BGFX_STATE_DEPTH_TEST_ALWAYS, FUNCTION_NAMES, FUNCTION_COUNT);