summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/bgfx
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/render/bgfx')
-rw-r--r--src/osd/modules/render/bgfx/blendreader.cpp58
-rw-r--r--src/osd/modules/render/bgfx/blendreader.h12
-rw-r--r--src/osd/modules/render/bgfx/chain.h18
-rw-r--r--src/osd/modules/render/bgfx/chainentry.h20
-rw-r--r--src/osd/modules/render/bgfx/chainentryreader.cpp4
-rw-r--r--src/osd/modules/render/bgfx/chainentryreader.h6
-rw-r--r--src/osd/modules/render/bgfx/chainreader.cpp4
-rw-r--r--src/osd/modules/render/bgfx/chainreader.h6
-rw-r--r--src/osd/modules/render/bgfx/cullreader.cpp8
-rw-r--r--src/osd/modules/render/bgfx/cullreader.h8
-rw-r--r--src/osd/modules/render/bgfx/depthreader.cpp32
-rw-r--r--src/osd/modules/render/bgfx/depthreader.h8
-rw-r--r--src/osd/modules/render/bgfx/effect.cpp42
-rw-r--r--src/osd/modules/render/bgfx/effect.h20
-rw-r--r--src/osd/modules/render/bgfx/effectmanager.cpp24
-rw-r--r--src/osd/modules/render/bgfx/effectmanager.h16
-rw-r--r--src/osd/modules/render/bgfx/effectreader.cpp62
-rw-r--r--src/osd/modules/render/bgfx/effectreader.h6
-rw-r--r--src/osd/modules/render/bgfx/inputpair.cpp2
-rw-r--r--src/osd/modules/render/bgfx/inputpair.h10
-rw-r--r--src/osd/modules/render/bgfx/parameter.h6
-rw-r--r--src/osd/modules/render/bgfx/paramreader.cpp6
-rw-r--r--src/osd/modules/render/bgfx/paramreader.h10
-rw-r--r--src/osd/modules/render/bgfx/shadermanager.cpp26
-rw-r--r--src/osd/modules/render/bgfx/shadermanager.h16
-rw-r--r--src/osd/modules/render/bgfx/slider.h12
-rw-r--r--src/osd/modules/render/bgfx/sliderreader.cpp14
-rw-r--r--src/osd/modules/render/bgfx/sliderreader.h10
-rw-r--r--src/osd/modules/render/bgfx/statereader.cpp110
-rw-r--r--src/osd/modules/render/bgfx/statereader.h32
-rw-r--r--src/osd/modules/render/bgfx/target.h12
-rw-r--r--src/osd/modules/render/bgfx/targetmanager.cpp20
-rw-r--r--src/osd/modules/render/bgfx/targetmanager.h16
-rw-r--r--src/osd/modules/render/bgfx/texture.h28
-rw-r--r--src/osd/modules/render/bgfx/texturemanager.cpp20
-rw-r--r--src/osd/modules/render/bgfx/texturemanager.h14
-rw-r--r--src/osd/modules/render/bgfx/uniform.cpp64
-rw-r--r--src/osd/modules/render/bgfx/uniform.h40
-rw-r--r--src/osd/modules/render/bgfx/uniformreader.cpp58
-rw-r--r--src/osd/modules/render/bgfx/uniformreader.h20
-rw-r--r--src/osd/modules/render/bgfx/writereader.cpp22
-rw-r--r--src/osd/modules/render/bgfx/writereader.h12
42 files changed, 467 insertions, 467 deletions
diff --git a/src/osd/modules/render/bgfx/blendreader.cpp b/src/osd/modules/render/bgfx/blendreader.cpp
index 45020a08027..f96f20a4ba8 100644
--- a/src/osd/modules/render/bgfx/blendreader.cpp
+++ b/src/osd/modules/render/bgfx/blendreader.cpp
@@ -11,41 +11,41 @@
#include "blendreader.h"
const blend_reader::string_to_enum blend_reader::EQUATION_NAMES[blend_reader::EQUATION_COUNT] = {
- { "add", BGFX_STATE_BLEND_EQUATION_ADD },
- { "sub", BGFX_STATE_BLEND_EQUATION_SUB },
- { "subtract", BGFX_STATE_BLEND_EQUATION_SUB },
- { "revSub", BGFX_STATE_BLEND_EQUATION_REVSUB },
- { "revSubtract", BGFX_STATE_BLEND_EQUATION_REVSUB },
- { "min", BGFX_STATE_BLEND_EQUATION_MIN },
- { "max", BGFX_STATE_BLEND_EQUATION_MAX }
+ { "add", BGFX_STATE_BLEND_EQUATION_ADD },
+ { "sub", BGFX_STATE_BLEND_EQUATION_SUB },
+ { "subtract", BGFX_STATE_BLEND_EQUATION_SUB },
+ { "revSub", BGFX_STATE_BLEND_EQUATION_REVSUB },
+ { "revSubtract", BGFX_STATE_BLEND_EQUATION_REVSUB },
+ { "min", BGFX_STATE_BLEND_EQUATION_MIN },
+ { "max", BGFX_STATE_BLEND_EQUATION_MAX }
};
const blend_reader::string_to_enum blend_reader::FUNCTION_NAMES[blend_reader::FUNCTION_COUNT] = {
- { "0", BGFX_STATE_BLEND_ZERO },
- { "zero", BGFX_STATE_BLEND_ZERO },
- { "1", BGFX_STATE_BLEND_ONE },
- { "one", BGFX_STATE_BLEND_ONE },
- { "srcColor", BGFX_STATE_BLEND_SRC_COLOR },
- { "1-srcColor", BGFX_STATE_BLEND_INV_SRC_COLOR },
- { "invSrcColor", BGFX_STATE_BLEND_INV_SRC_COLOR },
- { "dstColor", BGFX_STATE_BLEND_DST_COLOR },
- { "1-dstColor", BGFX_STATE_BLEND_INV_DST_COLOR },
- { "invDstColor", BGFX_STATE_BLEND_INV_DST_COLOR },
- { "srcAlpha", BGFX_STATE_BLEND_SRC_ALPHA },
- { "1-srcAlpha", BGFX_STATE_BLEND_INV_SRC_ALPHA },
- { "invSrcAlpha", BGFX_STATE_BLEND_INV_SRC_ALPHA },
- { "dstAlpha", BGFX_STATE_BLEND_DST_ALPHA },
- { "1-dstAlpha", BGFX_STATE_BLEND_INV_DST_ALPHA },
- { "invDstAlpha", BGFX_STATE_BLEND_INV_DST_ALPHA }
+ { "0", BGFX_STATE_BLEND_ZERO },
+ { "zero", BGFX_STATE_BLEND_ZERO },
+ { "1", BGFX_STATE_BLEND_ONE },
+ { "one", BGFX_STATE_BLEND_ONE },
+ { "srcColor", BGFX_STATE_BLEND_SRC_COLOR },
+ { "1-srcColor", BGFX_STATE_BLEND_INV_SRC_COLOR },
+ { "invSrcColor", BGFX_STATE_BLEND_INV_SRC_COLOR },
+ { "dstColor", BGFX_STATE_BLEND_DST_COLOR },
+ { "1-dstColor", BGFX_STATE_BLEND_INV_DST_COLOR },
+ { "invDstColor", BGFX_STATE_BLEND_INV_DST_COLOR },
+ { "srcAlpha", BGFX_STATE_BLEND_SRC_ALPHA },
+ { "1-srcAlpha", BGFX_STATE_BLEND_INV_SRC_ALPHA },
+ { "invSrcAlpha", BGFX_STATE_BLEND_INV_SRC_ALPHA },
+ { "dstAlpha", BGFX_STATE_BLEND_DST_ALPHA },
+ { "1-dstAlpha", BGFX_STATE_BLEND_INV_DST_ALPHA },
+ { "invDstAlpha", BGFX_STATE_BLEND_INV_DST_ALPHA }
};
uint64_t blend_reader::read_from_value(const Value& value)
{
- uint64_t equation = get_enum_from_value(value, "equation", BGFX_STATE_BLEND_EQUATION_ADD, EQUATION_NAMES, EQUATION_COUNT);
- uint64_t srccolor = get_enum_from_value(value, "srcColor", BGFX_STATE_BLEND_ONE, FUNCTION_NAMES, FUNCTION_COUNT);
- uint64_t dstcolor = get_enum_from_value(value, "dstColor", BGFX_STATE_BLEND_ZERO, FUNCTION_NAMES, FUNCTION_COUNT);
- uint64_t srcalpha = get_enum_from_value(value, "srcAlpha", BGFX_STATE_BLEND_ONE, FUNCTION_NAMES, FUNCTION_COUNT);
- uint64_t dstalpha = get_enum_from_value(value, "dstAlpha", BGFX_STATE_BLEND_ZERO, FUNCTION_NAMES, FUNCTION_COUNT);
+ uint64_t equation = get_enum_from_value(value, "equation", BGFX_STATE_BLEND_EQUATION_ADD, EQUATION_NAMES, EQUATION_COUNT);
+ uint64_t srccolor = get_enum_from_value(value, "srcColor", BGFX_STATE_BLEND_ONE, FUNCTION_NAMES, FUNCTION_COUNT);
+ uint64_t dstcolor = get_enum_from_value(value, "dstColor", BGFX_STATE_BLEND_ZERO, FUNCTION_NAMES, FUNCTION_COUNT);
+ uint64_t srcalpha = get_enum_from_value(value, "srcAlpha", BGFX_STATE_BLEND_ONE, FUNCTION_NAMES, FUNCTION_COUNT);
+ uint64_t dstalpha = get_enum_from_value(value, "dstAlpha", BGFX_STATE_BLEND_ZERO, FUNCTION_NAMES, FUNCTION_COUNT);
- return BGFX_STATE_BLEND_EQUATION(equation) | BGFX_STATE_BLEND_FUNC_SEPARATE(srccolor, dstcolor, srcalpha, dstalpha);
+ return BGFX_STATE_BLEND_EQUATION(equation) | BGFX_STATE_BLEND_FUNC_SEPARATE(srccolor, dstcolor, srcalpha, dstalpha);
}
diff --git a/src/osd/modules/render/bgfx/blendreader.h b/src/osd/modules/render/bgfx/blendreader.h
index 6dd16ae5d88..732ab47b1da 100644
--- a/src/osd/modules/render/bgfx/blendreader.h
+++ b/src/osd/modules/render/bgfx/blendreader.h
@@ -19,13 +19,13 @@ using namespace rapidjson;
class blend_reader : public state_reader {
public:
- static uint64_t read_from_value(const Value& value);
+ static uint64_t read_from_value(const Value& value);
private:
- static const int EQUATION_COUNT = 7;
- static const string_to_enum EQUATION_NAMES[EQUATION_COUNT];
- static const int FUNCTION_COUNT = 16;
- static const string_to_enum FUNCTION_NAMES[FUNCTION_COUNT];
+ static const int EQUATION_COUNT = 7;
+ static const string_to_enum EQUATION_NAMES[EQUATION_COUNT];
+ static const int FUNCTION_COUNT = 16;
+ static const string_to_enum FUNCTION_NAMES[FUNCTION_COUNT];
};
-#endif // __DRAWBGFX_BLEND_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_BLEND_READER__
diff --git a/src/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h
index c34b1830681..7721bbaf74b 100644
--- a/src/osd/modules/render/bgfx/chain.h
+++ b/src/osd/modules/render/bgfx/chain.h
@@ -22,17 +22,17 @@ class render_primitive;
class bgfx_chain
{
public:
- bgfx_chain(std::string name, std::string author, std::vector<bgfx_slider*> sliders, std::vector<bgfx_parameter*> params, std::vector<bgfx_chain_entry*> entries);
- ~bgfx_chain();
+ bgfx_chain(std::string name, std::string author, std::vector<bgfx_slider*> sliders, std::vector<bgfx_parameter*> params, std::vector<bgfx_chain_entry*> entries);
+ ~bgfx_chain();
- void submit(render_primitive* prim, int view);
+ void submit(render_primitive* prim, int view);
private:
- std::string m_name;
- std::string m_author;
- std::vector<bgfx_slider*> m_sliders;
- std::vector<bgfx_parameter*> m_params;
- std::vector<bgfx_chain_entry*> m_entries;
+ std::string m_name;
+ std::string m_author;
+ std::vector<bgfx_slider*> m_sliders;
+ std::vector<bgfx_parameter*> m_params;
+ std::vector<bgfx_chain_entry*> m_entries;
};
-#endif // __DRAWBGFX_CHAIN__ \ No newline at end of file
+#endif // __DRAWBGFX_CHAIN__
diff --git a/src/osd/modules/render/bgfx/chainentry.h b/src/osd/modules/render/bgfx/chainentry.h
index d607dd4ec7d..83a615d28a5 100644
--- a/src/osd/modules/render/bgfx/chainentry.h
+++ b/src/osd/modules/render/bgfx/chainentry.h
@@ -27,19 +27,19 @@ class bgfx_target;
class bgfx_chain_entry
{
public:
- bgfx_chain_entry(std::string name, bgfx_effect* effect, std::vector<bgfx_input_pair>& inputs, bgfx_target* output);
- ~bgfx_chain_entry();
+ bgfx_chain_entry(std::string name, bgfx_effect* effect, std::vector<bgfx_input_pair>& inputs, bgfx_target* output);
+ ~bgfx_chain_entry();
- void submit(render_primitive* prim, int view);
+ void submit(render_primitive* prim, int view);
- // Getters
- std::string name() const { return m_name; }
+ // Getters
+ std::string name() const { return m_name; }
private:
- std::string m_name;
- bgfx_effect* m_effect;
- std::vector<bgfx_input_pair> m_inputs;
- bgfx_target* m_output;
+ std::string m_name;
+ bgfx_effect* m_effect;
+ std::vector<bgfx_input_pair> m_inputs;
+ bgfx_target* m_output;
};
-#endif // __DRAWBGFX_CHAIN_ENTRY__ \ No newline at end of file
+#endif // __DRAWBGFX_CHAIN_ENTRY__
diff --git a/src/osd/modules/render/bgfx/chainentryreader.cpp b/src/osd/modules/render/bgfx/chainentryreader.cpp
index 39338359e81..ef9322782ee 100644
--- a/src/osd/modules/render/bgfx/chainentryreader.cpp
+++ b/src/osd/modules/render/bgfx/chainentryreader.cpp
@@ -20,7 +20,7 @@
bgfx_chain_entry* chain_entry_reader::read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects)
{
- validate_parameters(value);
+ validate_parameters(value);
bgfx_effect* effect = effects.effect(value["effect"].GetString());
@@ -53,4 +53,4 @@ void chain_entry_reader::validate_parameters(const Value& value)
assert(value["shader"].IsString());
assert(value.HasMember("output"));
assert(value["output"].IsString());
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/render/bgfx/chainentryreader.h b/src/osd/modules/render/bgfx/chainentryreader.h
index 8aeb1b402de..09001a6ea70 100644
--- a/src/osd/modules/render/bgfx/chainentryreader.h
+++ b/src/osd/modules/render/bgfx/chainentryreader.h
@@ -21,10 +21,10 @@ class effect_manager;
class chain_entry_reader : public state_reader
{
public:
- static bgfx_chain_entry* read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects);
+ static bgfx_chain_entry* read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects);
private:
- static void validate_parameters(const Value& value);
+ static void validate_parameters(const Value& value);
};
-#endif // __DRAWBGFX_CHAIN_ENTRY_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_CHAIN_ENTRY_READER__
diff --git a/src/osd/modules/render/bgfx/chainreader.cpp b/src/osd/modules/render/bgfx/chainreader.cpp
index 8a69e007872..2498e8206b6 100644
--- a/src/osd/modules/render/bgfx/chainreader.cpp
+++ b/src/osd/modules/render/bgfx/chainreader.cpp
@@ -20,7 +20,7 @@
bgfx_chain* chain_reader::read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t screen_width, uint32_t screen_height)
{
- validate_parameters(value);
+ validate_parameters(value);
std::string name = value["name"].GetString();
std::string author = value["author"].GetString();
@@ -92,4 +92,4 @@ void chain_reader::validate_parameters(const Value& value)
assert(value.HasMember("author"));
assert(value["author"].IsString());
assert(value.HasMember("passes"));
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/render/bgfx/chainreader.h b/src/osd/modules/render/bgfx/chainreader.h
index 6e803516189..fb5dccf0d1c 100644
--- a/src/osd/modules/render/bgfx/chainreader.h
+++ b/src/osd/modules/render/bgfx/chainreader.h
@@ -21,10 +21,10 @@ class effect_manager;
class chain_reader : public state_reader
{
public:
- static bgfx_chain* read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t screen_width, uint32_t screen_height);
+ static bgfx_chain* read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t screen_width, uint32_t screen_height);
private:
- static void validate_parameters(const Value& value);
+ static void validate_parameters(const Value& value);
};
-#endif // __DRAWBGFX_CHAIN_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_CHAIN_READER__
diff --git a/src/osd/modules/render/bgfx/cullreader.cpp b/src/osd/modules/render/bgfx/cullreader.cpp
index 0890d731583..593e712fecb 100644
--- a/src/osd/modules/render/bgfx/cullreader.cpp
+++ b/src/osd/modules/render/bgfx/cullreader.cpp
@@ -11,12 +11,12 @@
#include "cullreader.h"
const cull_reader::string_to_enum cull_reader::MODE_NAMES[cull_reader::MODE_COUNT] = {
- { "none", 0 },
- { "cw", BGFX_STATE_CULL_CW },
- { "ccw", BGFX_STATE_CULL_CCW }
+ { "none", 0 },
+ { "cw", BGFX_STATE_CULL_CW },
+ { "ccw", BGFX_STATE_CULL_CCW }
};
uint64_t cull_reader::read_from_value(const Value& value)
{
- return get_enum_from_value(value, "mode", BGFX_STATE_CULL_CCW, MODE_NAMES, MODE_COUNT);
+ return get_enum_from_value(value, "mode", BGFX_STATE_CULL_CCW, MODE_NAMES, MODE_COUNT);
}
diff --git a/src/osd/modules/render/bgfx/cullreader.h b/src/osd/modules/render/bgfx/cullreader.h
index 432ed494cf2..5c521a108a2 100644
--- a/src/osd/modules/render/bgfx/cullreader.h
+++ b/src/osd/modules/render/bgfx/cullreader.h
@@ -15,11 +15,11 @@
class cull_reader : public state_reader {
public:
- static uint64_t read_from_value(const Value& value);
+ static uint64_t read_from_value(const Value& value);
private:
- static const int MODE_COUNT = 3;
- static const string_to_enum MODE_NAMES[MODE_COUNT];
+ static const int MODE_COUNT = 3;
+ static const string_to_enum MODE_NAMES[MODE_COUNT];
};
-#endif // __DRAWBGFX_CULL_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_CULL_READER__
diff --git a/src/osd/modules/render/bgfx/depthreader.cpp b/src/osd/modules/render/bgfx/depthreader.cpp
index 077137159fe..cdcfa1b2046 100644
--- a/src/osd/modules/render/bgfx/depthreader.cpp
+++ b/src/osd/modules/render/bgfx/depthreader.cpp
@@ -11,26 +11,26 @@
#include "depthreader.h"
const depth_reader::string_to_enum depth_reader::FUNCTION_NAMES[depth_reader::FUNCTION_COUNT] = {
- { "never", BGFX_STATE_DEPTH_TEST_NEVER },
- { "less", BGFX_STATE_DEPTH_TEST_LESS },
- { "equal", BGFX_STATE_DEPTH_TEST_EQUAL },
- { "lequal", BGFX_STATE_DEPTH_TEST_LEQUAL },
- { "greater", BGFX_STATE_DEPTH_TEST_GREATER },
- { "notequal", BGFX_STATE_DEPTH_TEST_NOTEQUAL },
- { "gequal", BGFX_STATE_DEPTH_TEST_GEQUAL },
- { "always", BGFX_STATE_DEPTH_TEST_ALWAYS }
+ { "never", BGFX_STATE_DEPTH_TEST_NEVER },
+ { "less", BGFX_STATE_DEPTH_TEST_LESS },
+ { "equal", BGFX_STATE_DEPTH_TEST_EQUAL },
+ { "lequal", BGFX_STATE_DEPTH_TEST_LEQUAL },
+ { "greater", BGFX_STATE_DEPTH_TEST_GREATER },
+ { "notequal", BGFX_STATE_DEPTH_TEST_NOTEQUAL },
+ { "gequal", BGFX_STATE_DEPTH_TEST_GEQUAL },
+ { "always", BGFX_STATE_DEPTH_TEST_ALWAYS }
};
uint64_t depth_reader::read_from_value(const Value& value)
{
- uint64_t write_enable = 0;
- if (value.HasMember("writeEnable"))
- {
- assert(value["writeEnable"].IsBool());
- write_enable = value["writeEnable"].GetBool() ? BGFX_STATE_DEPTH_WRITE: 0;
- }
+ uint64_t write_enable = 0;
+ if (value.HasMember("writeEnable"))
+ {
+ assert(value["writeEnable"].IsBool());
+ 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);
+ uint64_t function = get_enum_from_value(value, "function", BGFX_STATE_DEPTH_TEST_ALWAYS, FUNCTION_NAMES, FUNCTION_COUNT);
- return write_enable | function;
+ return write_enable | function;
}
diff --git a/src/osd/modules/render/bgfx/depthreader.h b/src/osd/modules/render/bgfx/depthreader.h
index 5b2fc4e374c..761a1653323 100644
--- a/src/osd/modules/render/bgfx/depthreader.h
+++ b/src/osd/modules/render/bgfx/depthreader.h
@@ -15,11 +15,11 @@
class depth_reader : public state_reader {
public:
- static uint64_t read_from_value(const Value& value);
+ static uint64_t read_from_value(const Value& value);
private:
- static const int FUNCTION_COUNT = 8;
- static const string_to_enum FUNCTION_NAMES[FUNCTION_COUNT];
+ static const int FUNCTION_COUNT = 8;
+ static const string_to_enum FUNCTION_NAMES[FUNCTION_COUNT];
};
-#endif // __DRAWBGFX_DEPTH_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_DEPTH_READER__
diff --git a/src/osd/modules/render/bgfx/effect.cpp b/src/osd/modules/render/bgfx/effect.cpp
index bf6ccb963c5..98bf317a50c 100644
--- a/src/osd/modules/render/bgfx/effect.cpp
+++ b/src/osd/modules/render/bgfx/effect.cpp
@@ -9,24 +9,24 @@
#include "effect.h"
bgfx_effect::bgfx_effect(uint64_t state, bgfx::ShaderHandle vertex_shader, bgfx::ShaderHandle fragment_shader, std::vector<bgfx_uniform*> uniforms)
- : m_state(state)
+ : m_state(state)
{
- m_program_handle = bgfx::createProgram(vertex_shader, fragment_shader, false);
+ m_program_handle = bgfx::createProgram(vertex_shader, fragment_shader, false);
- for (int i = 0; i < uniforms.size(); i++)
- {
- m_uniforms[uniforms[i]->name()] = uniforms[i];
- }
+ for (int i = 0; i < uniforms.size(); i++)
+ {
+ m_uniforms[uniforms[i]->name()] = uniforms[i];
+ }
}
bgfx_effect::~bgfx_effect()
{
- for (std::pair<std::string, bgfx_uniform*> uniform : m_uniforms)
- {
- delete uniform.second;
- }
- m_uniforms.clear();
- bgfx::destroyProgram(m_program_handle);
+ for (std::pair<std::string, bgfx_uniform*> uniform : m_uniforms)
+ {
+ delete uniform.second;
+ }
+ m_uniforms.clear();
+ bgfx::destroyProgram(m_program_handle);
}
void bgfx_effect::submit(int view)
@@ -35,18 +35,18 @@ void bgfx_effect::submit(int view)
{
(uniform_pair.second)->upload();
}
- bgfx::setState(m_state);
- bgfx::submit(view, m_program_handle);
+ bgfx::setState(m_state);
+ bgfx::submit(view, m_program_handle);
}
bgfx_uniform* bgfx_effect::uniform(std::string name)
{
- std::map<std::string, bgfx_uniform*>::iterator iter = m_uniforms.find(name);
+ std::map<std::string, bgfx_uniform*>::iterator iter = m_uniforms.find(name);
- if (iter != m_uniforms.end())
- {
- return iter->second;
- }
+ if (iter != m_uniforms.end())
+ {
+ return iter->second;
+ }
- return nullptr;
-} \ No newline at end of file
+ return nullptr;
+}
diff --git a/src/osd/modules/render/bgfx/effect.h b/src/osd/modules/render/bgfx/effect.h
index e87f418022e..2bbc4b8fda9 100644
--- a/src/osd/modules/render/bgfx/effect.h
+++ b/src/osd/modules/render/bgfx/effect.h
@@ -22,19 +22,19 @@
class bgfx_effect
{
public:
- bgfx_effect(uint64_t state, bgfx::ShaderHandle vertexShader, bgfx::ShaderHandle fragmentShader, std::vector<bgfx_uniform*> uniforms);
- ~bgfx_effect();
+ bgfx_effect(uint64_t state, bgfx::ShaderHandle vertexShader, bgfx::ShaderHandle fragmentShader, std::vector<bgfx_uniform*> uniforms);
+ ~bgfx_effect();
- void submit(int view);
+ void submit(int view);
- // Getters
- bgfx_uniform* uniform(std::string name);
- bgfx::ProgramHandle get_program() const { return m_program_handle; }
+ // Getters
+ bgfx_uniform* uniform(std::string name);
+ bgfx::ProgramHandle get_program() const { return m_program_handle; }
private:
- uint64_t m_state;
- bgfx::ProgramHandle m_program_handle;
- std::map<std::string, bgfx_uniform*> m_uniforms;
+ uint64_t m_state;
+ bgfx::ProgramHandle m_program_handle;
+ std::map<std::string, bgfx_uniform*> m_uniforms;
};
-#endif // __DRAWBGFX_EFFECT__ \ No newline at end of file
+#endif // __DRAWBGFX_EFFECT__
diff --git a/src/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp
index ea35020ad85..dc2550354f2 100644
--- a/src/osd/modules/render/bgfx/effectmanager.cpp
+++ b/src/osd/modules/render/bgfx/effectmanager.cpp
@@ -25,22 +25,22 @@ using namespace rapidjson;
effect_manager::~effect_manager()
{
- for (std::pair<std::string, bgfx_effect*> effect : m_effects)
- {
+ for (std::pair<std::string, bgfx_effect*> effect : m_effects)
+ {
delete effect.second;
- }
- m_effects.clear();
+ }
+ m_effects.clear();
}
bgfx_effect* effect_manager::effect(std::string name)
{
- std::map<std::string, bgfx_effect*>::iterator iter = m_effects.find(name);
- if (iter != m_effects.end())
- {
- return iter->second;
- }
+ std::map<std::string, bgfx_effect*>::iterator iter = m_effects.find(name);
+ if (iter != m_effects.end())
+ {
+ return iter->second;
+ }
- return load_effect(name);
+ return load_effect(name);
}
bgfx_effect* effect_manager::load_effect(std::string name) {
@@ -60,7 +60,7 @@ bgfx_effect* effect_manager::load_effect(std::string name) {
document.Parse<0>(data);
bgfx_effect* effect = effect_reader::read_from_value(m_shaders, document);
- m_effects[name] = effect;
+ m_effects[name] = effect;
- return effect;
+ return effect;
}
diff --git a/src/osd/modules/render/bgfx/effectmanager.h b/src/osd/modules/render/bgfx/effectmanager.h
index e86b24669ad..e3d1666d26e 100644
--- a/src/osd/modules/render/bgfx/effectmanager.h
+++ b/src/osd/modules/render/bgfx/effectmanager.h
@@ -25,17 +25,17 @@ class bgfx_effect;
class effect_manager {
public:
- effect_manager(shader_manager& shaders) : m_shaders(shaders) { }
- ~effect_manager();
+ effect_manager(shader_manager& shaders) : m_shaders(shaders) { }
+ ~effect_manager();
- // Getters
- bgfx_effect* effect(std::string name);
+ // Getters
+ bgfx_effect* effect(std::string name);
private:
- bgfx_effect* load_effect(std::string name);
+ bgfx_effect* load_effect(std::string name);
- shader_manager& m_shaders;
- std::map<std::string, bgfx_effect*> m_effects;
+ shader_manager& m_shaders;
+ std::map<std::string, bgfx_effect*> m_effects;
};
-#endif // __DRAWBGFX_EFFECT_MANAGER__ \ No newline at end of file
+#endif // __DRAWBGFX_EFFECT_MANAGER__
diff --git a/src/osd/modules/render/bgfx/effectreader.cpp b/src/osd/modules/render/bgfx/effectreader.cpp
index 978c004337f..63a6a925a64 100644
--- a/src/osd/modules/render/bgfx/effectreader.cpp
+++ b/src/osd/modules/render/bgfx/effectreader.cpp
@@ -24,54 +24,54 @@
bgfx_effect* effect_reader::read_from_value(shader_manager& shaders, const Value& value)
{
- validate_parameters(value);
+ validate_parameters(value);
- uint64_t blend = blend_reader::read_from_value(value["blend"]);
- uint64_t depth = depth_reader::read_from_value(value["depth"]);
- uint64_t cull = cull_reader::read_from_value(value["cull"]);
- uint64_t write = write_reader::read_from_value(value["write"]);
+ uint64_t blend = blend_reader::read_from_value(value["blend"]);
+ uint64_t depth = depth_reader::read_from_value(value["depth"]);
+ uint64_t cull = cull_reader::read_from_value(value["cull"]);
+ uint64_t write = write_reader::read_from_value(value["write"]);
- std::vector<bgfx_uniform*> uniforms;
- const Value& uniform_array = value["uniforms"];
- for (UINT32 i = 0; i < uniform_array.Size(); i++)
- {
- uniforms.push_back(uniform_reader::read_from_value(uniform_array[i]));
- }
+ std::vector<bgfx_uniform*> uniforms;
+ const Value& uniform_array = value["uniforms"];
+ for (UINT32 i = 0; i < uniform_array.Size(); i++)
+ {
+ uniforms.push_back(uniform_reader::read_from_value(uniform_array[i]));
+ }
- std::string vertex_name(value["vertex"].GetString());
+ std::string vertex_name(value["vertex"].GetString());
bgfx::ShaderHandle vertex_shader = shaders.shader(vertex_name);
std::string fragment_name("");
if (value.HasMember("fragment"))
{
- fragment_name = value["fragment"].GetString();
+ fragment_name = value["fragment"].GetString();
}
else if (value.HasMember("pixel"))
{
- fragment_name = value["pixel"].GetString();
+ fragment_name = value["pixel"].GetString();
}
bgfx::ShaderHandle fragment_shader = shaders.shader(fragment_name);
- return new bgfx_effect(blend | depth | cull | write, vertex_shader, fragment_shader, uniforms);
+ return new bgfx_effect(blend | depth | cull | write, vertex_shader, fragment_shader, uniforms);
}
void effect_reader::validate_parameters(const Value& value)
{
- assert(value.HasMember("blend"));
- assert(value.HasMember("depth"));
- assert(value.HasMember("cull"));
- assert(value.HasMember("write"));
- assert(value.HasMember("vertex"));
- assert(value["vertex"].IsString());
- assert(value.HasMember("fragment") || value.HasMember("pixel"));
- if (value.HasMember("fragment"))
- {
- assert(value["fragment"].IsString());
+ assert(value.HasMember("blend"));
+ assert(value.HasMember("depth"));
+ assert(value.HasMember("cull"));
+ assert(value.HasMember("write"));
+ assert(value.HasMember("vertex"));
+ assert(value["vertex"].IsString());
+ assert(value.HasMember("fragment") || value.HasMember("pixel"));
+ if (value.HasMember("fragment"))
+ {
+ assert(value["fragment"].IsString());
}
- if (value.HasMember("pixel"))
- {
- assert(value["pixel"].IsString());
+ if (value.HasMember("pixel"))
+ {
+ assert(value["pixel"].IsString());
}
- assert(value.HasMember("uniforms"));
- assert(value["uniforms"].IsArray());
-} \ No newline at end of file
+ assert(value.HasMember("uniforms"));
+ assert(value["uniforms"].IsArray());
+}
diff --git a/src/osd/modules/render/bgfx/effectreader.h b/src/osd/modules/render/bgfx/effectreader.h
index cc0c3ea69e5..a48500131e0 100644
--- a/src/osd/modules/render/bgfx/effectreader.h
+++ b/src/osd/modules/render/bgfx/effectreader.h
@@ -19,10 +19,10 @@ class shader_manager;
class effect_reader : public state_reader
{
public:
- static bgfx_effect* read_from_value(shader_manager& shaders, const Value& value);
+ static bgfx_effect* read_from_value(shader_manager& shaders, const Value& value);
private:
- static void validate_parameters(const Value& value);
+ static void validate_parameters(const Value& value);
};
-#endif // __DRAWBGFX_EFFECT_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_EFFECT_READER__
diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp
index bcebb755ab6..e28372db3ce 100644
--- a/src/osd/modules/render/bgfx/inputpair.cpp
+++ b/src/osd/modules/render/bgfx/inputpair.cpp
@@ -23,4 +23,4 @@ bgfx_input_pair::bgfx_input_pair(int index, std::string sampler, bgfx_texture* t
void bgfx_input_pair::bind(bgfx_effect *effect)
{
bgfx::setTexture(m_index, effect->uniform(m_sampler)->handle(), m_texture->handle());
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/render/bgfx/inputpair.h b/src/osd/modules/render/bgfx/inputpair.h
index 2cab7ff2363..196165c69f4 100644
--- a/src/osd/modules/render/bgfx/inputpair.h
+++ b/src/osd/modules/render/bgfx/inputpair.h
@@ -24,14 +24,14 @@ class bgfx_texture;
class bgfx_input_pair
{
public:
- bgfx_input_pair(int index, std::string sampler, bgfx_texture* texture);
+ bgfx_input_pair(int index, std::string sampler, bgfx_texture* texture);
void bind(bgfx_effect *effect);
private:
- int m_index;
- std::string m_sampler;
- bgfx_texture* m_texture;
+ int m_index;
+ std::string m_sampler;
+ bgfx_texture* m_texture;
};
-#endif // __DRAWBGFX_INPUT_PAIR__ \ No newline at end of file
+#endif // __DRAWBGFX_INPUT_PAIR__
diff --git a/src/osd/modules/render/bgfx/parameter.h b/src/osd/modules/render/bgfx/parameter.h
index 76defb439c4..b31b25d8a75 100644
--- a/src/osd/modules/render/bgfx/parameter.h
+++ b/src/osd/modules/render/bgfx/parameter.h
@@ -27,8 +27,8 @@ public:
PARAM_FRAME_MASK
};
- bgfx_parameter(std::string name, parameter_type type, int period);
- ~bgfx_parameter();
+ bgfx_parameter(std::string name, parameter_type type, int period);
+ ~bgfx_parameter();
void frame();
bool active();
@@ -40,4 +40,4 @@ private:
UINT32 m_frame;
};
-#endif // __DRAWBGFX_PARAMETER__ \ No newline at end of file
+#endif // __DRAWBGFX_PARAMETER__
diff --git a/src/osd/modules/render/bgfx/paramreader.cpp b/src/osd/modules/render/bgfx/paramreader.cpp
index f1391ec761e..39a995a1489 100644
--- a/src/osd/modules/render/bgfx/paramreader.cpp
+++ b/src/osd/modules/render/bgfx/paramreader.cpp
@@ -13,12 +13,12 @@
#include "parameter.h"
const parameter_reader::string_to_enum parameter_reader::TYPE_NAMES[parameter_reader::TYPE_COUNT] = {
- { "frame_mask", uint64_t(bgfx_parameter::parameter_type::PARAM_FRAME_MASK) }
+ { "frame_mask", uint64_t(bgfx_parameter::parameter_type::PARAM_FRAME_MASK) }
};
bgfx_parameter* parameter_reader::read_from_value(const Value& value)
{
- validate_parameters(value);
+ validate_parameters(value);
std::string name = value["name"].GetString();
bgfx_parameter::parameter_type type = bgfx_parameter::parameter_type(get_enum_from_value(value, "type", uint64_t(bgfx_parameter::parameter_type::PARAM_FRAME_MASK), TYPE_NAMES, TYPE_COUNT));
@@ -35,4 +35,4 @@ void parameter_reader::validate_parameters(const Value& value)
assert(value["type"].IsString());
assert(value.HasMember("period"));
assert(value["period"].IsDouble());
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/render/bgfx/paramreader.h b/src/osd/modules/render/bgfx/paramreader.h
index 12df9185dfc..4b31db52528 100644
--- a/src/osd/modules/render/bgfx/paramreader.h
+++ b/src/osd/modules/render/bgfx/paramreader.h
@@ -18,13 +18,13 @@ class bgfx_parameter;
class parameter_reader : public state_reader
{
public:
- static bgfx_parameter* read_from_value(const Value& value);
+ static bgfx_parameter* read_from_value(const Value& value);
private:
- static void validate_parameters(const Value& value);
+ static void validate_parameters(const Value& value);
- static const int TYPE_COUNT = 1;
- static const string_to_enum TYPE_NAMES[TYPE_COUNT];
+ static const int TYPE_COUNT = 1;
+ static const string_to_enum TYPE_NAMES[TYPE_COUNT];
};
-#endif // __DRAWBGFX_PARAM_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_PARAM_READER__
diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp
index 20821721ea8..f7e7b30e7ec 100644
--- a/src/osd/modules/render/bgfx/shadermanager.cpp
+++ b/src/osd/modules/render/bgfx/shadermanager.cpp
@@ -20,22 +20,22 @@
shader_manager::~shader_manager()
{
- for (std::pair<std::string, bgfx::ShaderHandle> shader : m_shaders)
- {
- bgfx::destroyShader(shader.second);
- }
- m_shaders.clear();
+ for (std::pair<std::string, bgfx::ShaderHandle> shader : m_shaders)
+ {
+ bgfx::destroyShader(shader.second);
+ }
+ m_shaders.clear();
}
bgfx::ShaderHandle shader_manager::shader(std::string name)
{
- std::map<std::string, bgfx::ShaderHandle>::iterator iter = m_shaders.find(name);
- if (iter != m_shaders.end())
- {
- return iter->second;
- }
+ std::map<std::string, bgfx::ShaderHandle>::iterator iter = m_shaders.find(name);
+ if (iter != m_shaders.end())
+ {
+ return iter->second;
+ }
- return load_shader(name);
+ return load_shader(name);
}
bgfx::ShaderHandle shader_manager::load_shader(std::string name) {
@@ -65,9 +65,9 @@ bgfx::ShaderHandle shader_manager::load_shader(std::string name) {
bgfx::ShaderHandle handle = bgfx::createShader(load_mem(shader_path + name + ".bin"));
- m_shaders[name] = handle;
+ m_shaders[name] = handle;
- return handle;
+ return handle;
}
const bgfx::Memory* shader_manager::load_mem(std::string name) {
diff --git a/src/osd/modules/render/bgfx/shadermanager.h b/src/osd/modules/render/bgfx/shadermanager.h
index a3dbb425088..5cc971ca829 100644
--- a/src/osd/modules/render/bgfx/shadermanager.h
+++ b/src/osd/modules/render/bgfx/shadermanager.h
@@ -21,17 +21,17 @@
class shader_manager {
public:
- shader_manager() {}
- ~shader_manager();
+ shader_manager() {}
+ ~shader_manager();
- // Getters
- bgfx::ShaderHandle shader(std::string name);
+ // Getters
+ bgfx::ShaderHandle shader(std::string name);
private:
- bgfx::ShaderHandle load_shader(std::string name);
- static const bgfx::Memory* load_mem(std::string name);
+ bgfx::ShaderHandle load_shader(std::string name);
+ static const bgfx::Memory* load_mem(std::string name);
- std::map<std::string, bgfx::ShaderHandle> m_shaders;
+ std::map<std::string, bgfx::ShaderHandle> m_shaders;
};
-#endif // __DRAWBGFX_SHADER_MANAGER__ \ No newline at end of file
+#endif // __DRAWBGFX_SHADER_MANAGER__
diff --git a/src/osd/modules/render/bgfx/slider.h b/src/osd/modules/render/bgfx/slider.h
index 6c3054d7cc2..efff831a4da 100644
--- a/src/osd/modules/render/bgfx/slider.h
+++ b/src/osd/modules/render/bgfx/slider.h
@@ -31,8 +31,8 @@ public:
SLIDER_VEC2
};
- bgfx_slider(slider_type type, std::string name, std::string description, void *defaults, void *min, void *max);
- ~bgfx_slider();
+ bgfx_slider(slider_type type, std::string name, std::string description, void *defaults, void *min, void *max);
+ ~bgfx_slider();
static size_t size(slider_type type);
static size_t storage_size(slider_type type);
@@ -41,9 +41,9 @@ protected:
slider_type m_type;
std::string m_name;
std::string m_description;
- char* m_data;
- char* m_min;
- char* m_max;
+ char* m_data;
+ char* m_min;
+ char* m_max;
};
-#endif // __DRAWBGFX_SLIDER__ \ No newline at end of file
+#endif // __DRAWBGFX_SLIDER__
diff --git a/src/osd/modules/render/bgfx/sliderreader.cpp b/src/osd/modules/render/bgfx/sliderreader.cpp
index 7bd2d8c59fa..2cd56d52457 100644
--- a/src/osd/modules/render/bgfx/sliderreader.cpp
+++ b/src/osd/modules/render/bgfx/sliderreader.cpp
@@ -13,16 +13,16 @@
#include "slider.h"
const slider_reader::string_to_enum slider_reader::TYPE_NAMES[slider_reader::TYPE_COUNT] = {
- { "bool", uint64_t(bgfx_slider::slider_type::SLIDER_BOOL) },
- { "float", uint64_t(bgfx_slider::slider_type::SLIDER_FLOAT) },
- { "int", uint64_t(bgfx_slider::slider_type::SLIDER_INT) },
- { "color", uint64_t(bgfx_slider::slider_type::SLIDER_COLOR) },
- { "vec2", uint64_t(bgfx_slider::slider_type::SLIDER_VEC2) }
+ { "bool", uint64_t(bgfx_slider::slider_type::SLIDER_BOOL) },
+ { "float", uint64_t(bgfx_slider::slider_type::SLIDER_FLOAT) },
+ { "int", uint64_t(bgfx_slider::slider_type::SLIDER_INT) },
+ { "color", uint64_t(bgfx_slider::slider_type::SLIDER_COLOR) },
+ { "vec2", uint64_t(bgfx_slider::slider_type::SLIDER_VEC2) }
};
bgfx_slider* slider_reader::read_from_value(const Value& value)
{
- validate_parameters(value);
+ validate_parameters(value);
bgfx_slider::slider_type type = bgfx_slider::slider_type(get_enum_from_value(value, "type", uint64_t(bgfx_slider::slider_type::SLIDER_FLOAT), TYPE_NAMES, TYPE_COUNT));
std::string name = value["name"].GetString();
@@ -71,4 +71,4 @@ void slider_reader::validate_parameters(const Value& value)
assert(value.HasMember("text"));
assert(value["text"].IsString());
assert(value.HasMember("default"));
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/render/bgfx/sliderreader.h b/src/osd/modules/render/bgfx/sliderreader.h
index 9253b9b9130..9140fded836 100644
--- a/src/osd/modules/render/bgfx/sliderreader.h
+++ b/src/osd/modules/render/bgfx/sliderreader.h
@@ -18,14 +18,14 @@ class bgfx_slider;
class slider_reader : public state_reader
{
public:
- static bgfx_slider* read_from_value(const Value& value);
+ static bgfx_slider* read_from_value(const Value& value);
private:
static void get_values(const Value& value, std::string name, float* values);
- static void validate_parameters(const Value& value);
+ static void validate_parameters(const Value& value);
- static const int TYPE_COUNT = 5;
- static const string_to_enum TYPE_NAMES[TYPE_COUNT];
+ static const int TYPE_COUNT = 5;
+ static const string_to_enum TYPE_NAMES[TYPE_COUNT];
};
-#endif // __DRAWBGFX_SLIDER_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_SLIDER_READER__
diff --git a/src/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp
index 2f222b19bdf..93fb021be5c 100644
--- a/src/osd/modules/render/bgfx/statereader.cpp
+++ b/src/osd/modules/render/bgfx/statereader.cpp
@@ -2,77 +2,77 @@
uint64_t state_reader::get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count)
{
- if (value.HasMember(name.c_str()))
- {
- assert(value[name.c_str()].IsString());
- return get_param_from_string(value[name.c_str()].GetString(), enums, count);
- }
- else
- {
- return default_value;
- }
+ if (value.HasMember(name.c_str()))
+ {
+ assert(value[name.c_str()].IsString());
+ return get_param_from_string(value[name.c_str()].GetString(), enums, count);
+ }
+ else
+ {
+ return default_value;
+ }
}
uint64_t state_reader::get_param_from_string(std::string value, const string_to_enum* enums, const int count)
{
- for (int i = 0; i < count; i++)
- {
- if (value == enums[i].m_string)
- {
- return enums[i].m_enum;
- }
- }
- assert(false);
- return 0;
+ for (int i = 0; i < count; i++)
+ {
+ if (value == enums[i].m_string)
+ {
+ return enums[i].m_enum;
+ }
+ }
+ assert(false);
+ return 0;
}
void state_reader::validate_array_parameter(const Value& value, std::string typeName, std::string paramName, const int count)
{
- const char* name = paramName.c_str();
- if (value.HasMember(name))
- {
- assert(value[name].IsArray());
- assert(value[name].Size() == count);
- }
+ const char* name = paramName.c_str();
+ if (value.HasMember(name))
+ {
+ assert(value[name].IsArray());
+ assert(value[name].Size() == count);
+ }
}
void state_reader::validate_double_parameter(const Value& value, std::string typeName, std::string name)
{
- if (value.HasMember(name.c_str()))
- {
- assert(value[name.c_str()].IsDouble());
- }
+ if (value.HasMember(name.c_str()))
+ {
+ assert(value[name.c_str()].IsDouble());
+ }
}
void state_reader::validate_string_parameter(const Value& value, std::string typeName, std::string name)
{
- if (value.HasMember(name.c_str()))
- {
- assert(value[name.c_str()].IsString());
- }
+ if (value.HasMember(name.c_str()))
+ {
+ assert(value[name.c_str()].IsString());
+ }
}
void state_reader::validate_boolean_parameter(const Value& value, std::string typeName, std::string name)
{
- if (value.HasMember(name.c_str()))
- {
- assert(value[name.c_str()].IsBool());
- }
+ if (value.HasMember(name.c_str()))
+ {
+ assert(value[name.c_str()].IsBool());
+ }
}
bool state_reader::get_bool(const Value& value, const std::string name, const bool default_value)
{
- if (value.HasMember(name.c_str()))
- {
- return value[name.c_str()].GetBool();
- }
- return default_value;
+ if (value.HasMember(name.c_str()))
+ {
+ return value[name.c_str()].GetBool();
+ }
+ return default_value;
}
void state_reader::get_float(const Value& value, const std::string name, float* out, float* default_value, int count)
{
- if (value.HasMember(name.c_str()))
- {
+ if (value.HasMember(name.c_str()))
+ {
if (count == 1)
{
*out = (float) value[name.c_str()].GetDouble();
@@ -82,26 +82,26 @@ void state_reader::get_float(const Value& value, const std::string name, float*
{
get_vec_values(value[name.c_str()], out, count);
}
- }
- for (int def = 0; def < count; def++)
- {
+ }
+ for (int def = 0; def < count; def++)
+ {
out[def] = default_value[def];
}
}
void state_reader::get_vec_values(const Value& value_array, float* data, const unsigned int count)
{
- for (unsigned int i = 0; i < count && i < value_array.Size(); i++)
- {
- data[i] = (float) value_array[i].GetDouble();
- }
+ for (unsigned int i = 0; i < count && i < value_array.Size(); i++)
+ {
+ data[i] = (float) value_array[i].GetDouble();
+ }
}
std::string state_reader::get_string(const Value& value, const std::string name, const std::string default_value)
{
- if (value.HasMember(name.c_str()))
- {
- return std::string(value[name.c_str()].GetString());
- }
- return default_value;
+ if (value.HasMember(name.c_str()))
+ {
+ return std::string(value[name.c_str()].GetString());
+ }
+ return default_value;
}
diff --git a/src/osd/modules/render/bgfx/statereader.h b/src/osd/modules/render/bgfx/statereader.h
index 57edea1d28e..d32cf52c817 100644
--- a/src/osd/modules/render/bgfx/statereader.h
+++ b/src/osd/modules/render/bgfx/statereader.h
@@ -13,26 +13,26 @@ using namespace rapidjson;
class state_reader
{
protected:
- struct string_to_enum
- {
- std::string m_string;
- const UINT64 m_enum;
- };
+ struct string_to_enum
+ {
+ std::string m_string;
+ const UINT64 m_enum;
+ };
- static void validate_array_parameter(const Value& value, std::string type_name, std::string name, const int count);
- static void validate_double_parameter(const Value& value, std::string type_name, std::string name);
- static void validate_string_parameter(const Value& value, std::string type_name, std::string name);
- static void validate_boolean_parameter(const Value& value, std::string type_name, std::string name);
+ static void validate_array_parameter(const Value& value, std::string type_name, std::string name, const int count);
+ static void validate_double_parameter(const Value& value, std::string type_name, std::string name);
+ static void validate_string_parameter(const Value& value, std::string type_name, std::string name);
+ static void validate_boolean_parameter(const Value& value, std::string type_name, std::string name);
- static bool get_bool(const Value& value, const std::string name, const bool default_value);
- static void get_float(const Value& value, const std::string name, float* out, float* default_value, const int count = 1);
- static std::string get_string(const Value& value, const std::string name, const std::string default_value);
+ static bool get_bool(const Value& value, const std::string name, const bool default_value);
+ static void get_float(const Value& value, const std::string name, float* out, float* default_value, const int count = 1);
+ static std::string get_string(const Value& value, const std::string name, const std::string default_value);
- static uint64_t get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count);
- static uint64_t get_param_from_string(std::string value, const string_to_enum* enums, const int count);
+ static uint64_t get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count);
+ static uint64_t get_param_from_string(std::string value, const string_to_enum* enums, const int count);
private:
- static void get_vec_values(const Value& value_array, float* data, const unsigned int count);
+ static void get_vec_values(const Value& value_array, float* data, const unsigned int count);
};
-#endif // __DRAWBGFX_STATE_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_STATE_READER__
diff --git a/src/osd/modules/render/bgfx/target.h b/src/osd/modules/render/bgfx/target.h
index 099288cbec1..d4cea313464 100644
--- a/src/osd/modules/render/bgfx/target.h
+++ b/src/osd/modules/render/bgfx/target.h
@@ -16,15 +16,15 @@
class bgfx_target : public bgfx_texture
{
public:
- bgfx_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter = false);
- bgfx_target(std::string name, void *handle, uint32_t width, uint32_t height);
- virtual ~bgfx_target();
+ bgfx_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter = false);
+ bgfx_target(std::string name, void *handle, uint32_t width, uint32_t height);
+ virtual ~bgfx_target();
- // Getters
- bgfx::FrameBufferHandle target() const { return m_target; }
+ // Getters
+ bgfx::FrameBufferHandle target() const { return m_target; }
private:
bgfx::FrameBufferHandle m_target;
};
-#endif // __DRAWBGFX_TARGET__ \ No newline at end of file
+#endif // __DRAWBGFX_TARGET__
diff --git a/src/osd/modules/render/bgfx/targetmanager.cpp b/src/osd/modules/render/bgfx/targetmanager.cpp
index 88bf6a9d96f..930fbf1bfe0 100644
--- a/src/osd/modules/render/bgfx/targetmanager.cpp
+++ b/src/osd/modules/render/bgfx/targetmanager.cpp
@@ -16,11 +16,11 @@
target_manager::~target_manager()
{
- for (std::pair<std::string, bgfx_target*> target : m_targets)
- {
+ for (std::pair<std::string, bgfx_target*> target : m_targets)
+ {
delete target.second;
- }
- m_targets.clear();
+ }
+ m_targets.clear();
}
bgfx_target* target_manager::create_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter)
@@ -45,11 +45,11 @@ bgfx_target* target_manager::create_target(std::string name, void *handle, uint3
bgfx_target* target_manager::target(std::string name)
{
- std::map<std::string, bgfx_target*>::iterator iter = m_targets.find(name);
- if (iter != m_targets.end())
- {
- return iter->second;
- }
+ std::map<std::string, bgfx_target*>::iterator iter = m_targets.find(name);
+ if (iter != m_targets.end())
+ {
+ return iter->second;
+ }
- return nullptr;
+ return nullptr;
}
diff --git a/src/osd/modules/render/bgfx/targetmanager.h b/src/osd/modules/render/bgfx/targetmanager.h
index 9cc957d1c38..0d5f6f5f020 100644
--- a/src/osd/modules/render/bgfx/targetmanager.h
+++ b/src/osd/modules/render/bgfx/targetmanager.h
@@ -25,20 +25,20 @@ class bgfx_target;
class target_manager {
public:
- target_manager(texture_manager& textures) : m_textures(textures) { }
- ~target_manager();
+ target_manager(texture_manager& textures) : m_textures(textures) { }
+ ~target_manager();
bgfx_target* create_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter = false);
bgfx_target* create_target(std::string name, void *handle, uint32_t width, uint32_t height);
- // Getters
- bgfx_target* target(std::string name);
+ // Getters
+ bgfx_target* target(std::string name);
private:
- bgfx_target* create_target(std::string name);
+ bgfx_target* create_target(std::string name);
- std::map<std::string, bgfx_target*> m_targets;
- texture_manager& m_textures;
+ std::map<std::string, bgfx_target*> m_targets;
+ texture_manager& m_textures;
};
-#endif // __DRAWBGFX_TARGET_MANAGER__ \ No newline at end of file
+#endif // __DRAWBGFX_TARGET_MANAGER__
diff --git a/src/osd/modules/render/bgfx/texture.h b/src/osd/modules/render/bgfx/texture.h
index 833ab230917..2fc3a596ddc 100644
--- a/src/osd/modules/render/bgfx/texture.h
+++ b/src/osd/modules/render/bgfx/texture.h
@@ -18,22 +18,22 @@
class bgfx_texture
{
public:
- bgfx_texture(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, void* data = nullptr, uint32_t flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP);
- virtual ~bgfx_texture();
+ bgfx_texture(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, void* data = nullptr, uint32_t flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP);
+ virtual ~bgfx_texture();
- // Getters
- std::string name() const { return m_name; }
- bgfx::TextureFormat::Enum format() const { return m_format; }
- uint32_t width() const { return m_width; }
- uint32_t height() const { return m_height; }
- bgfx::TextureHandle handle() const { return m_handle; }
+ // Getters
+ std::string name() const { return m_name; }
+ bgfx::TextureFormat::Enum format() const { return m_format; }
+ uint32_t width() const { return m_width; }
+ uint32_t height() const { return m_height; }
+ bgfx::TextureHandle handle() const { return m_handle; }
protected:
- std::string m_name;
- bgfx::TextureFormat::Enum m_format;
- uint32_t m_width;
- uint32_t m_height;
- bgfx::TextureHandle m_handle;
+ std::string m_name;
+ bgfx::TextureFormat::Enum m_format;
+ uint32_t m_width;
+ uint32_t m_height;
+ bgfx::TextureHandle m_handle;
};
-#endif // __DRAWBGFX_TEXTURE__ \ No newline at end of file
+#endif // __DRAWBGFX_TEXTURE__
diff --git a/src/osd/modules/render/bgfx/texturemanager.cpp b/src/osd/modules/render/bgfx/texturemanager.cpp
index bb8f49494da..4a8cdd5d934 100644
--- a/src/osd/modules/render/bgfx/texturemanager.cpp
+++ b/src/osd/modules/render/bgfx/texturemanager.cpp
@@ -16,11 +16,11 @@
texture_manager::~texture_manager()
{
- for (std::pair<std::string, bgfx_texture*> texture : m_textures)
- {
+ for (std::pair<std::string, bgfx_texture*> texture : m_textures)
+ {
delete texture.second;
- }
- m_textures.clear();
+ }
+ m_textures.clear();
}
void texture_manager::add_texture(std::string name, bgfx_texture* texture)
@@ -37,11 +37,11 @@ bgfx_texture* texture_manager::create_texture(std::string name, bgfx::TextureFor
bgfx_texture* texture_manager::texture(std::string name)
{
- std::map<std::string, bgfx_texture*>::iterator iter = m_textures.find(name);
- if (iter != m_textures.end())
- {
- return iter->second;
- }
+ std::map<std::string, bgfx_texture*>::iterator iter = m_textures.find(name);
+ if (iter != m_textures.end())
+ {
+ return iter->second;
+ }
- return nullptr;
+ return nullptr;
}
diff --git a/src/osd/modules/render/bgfx/texturemanager.h b/src/osd/modules/render/bgfx/texturemanager.h
index 627e6689fa9..69608c03616 100644
--- a/src/osd/modules/render/bgfx/texturemanager.h
+++ b/src/osd/modules/render/bgfx/texturemanager.h
@@ -23,19 +23,19 @@ class bgfx_texture;
class texture_manager {
public:
- texture_manager() { }
- ~texture_manager();
+ texture_manager() { }
+ ~texture_manager();
bgfx_texture* create_texture(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, void* data = nullptr, uint32_t flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP);
void add_texture(std::string name, bgfx_texture* texture);
- // Getters
- bgfx_texture* texture(std::string name);
+ // Getters
+ bgfx_texture* texture(std::string name);
private:
- bgfx_texture* create_texture(std::string name);
+ bgfx_texture* create_texture(std::string name);
- std::map<std::string, bgfx_texture*> m_textures;
+ std::map<std::string, bgfx_texture*> m_textures;
};
-#endif // __DRAWBGFX_TEXTURE_MANAGER__ \ No newline at end of file
+#endif // __DRAWBGFX_TEXTURE_MANAGER__
diff --git a/src/osd/modules/render/bgfx/uniform.cpp b/src/osd/modules/render/bgfx/uniform.cpp
index 632af6bd3b8..2898c27a5b8 100644
--- a/src/osd/modules/render/bgfx/uniform.cpp
+++ b/src/osd/modules/render/bgfx/uniform.cpp
@@ -10,73 +10,73 @@
#include <cstring>
bgfx_uniform::bgfx_uniform(std::string name, bgfx::UniformType::Enum type)
- : m_name(name)
- , m_type(type)
+ : m_name(name)
+ , m_type(type)
{
- m_handle = bgfx::createUniform(m_name.c_str(), m_type);
- m_data_size = get_size_for_type(type);
- if (m_data_size > 0)
- {
- m_data = new uint8_t[m_data_size];
- }
+ m_handle = bgfx::createUniform(m_name.c_str(), m_type);
+ m_data_size = get_size_for_type(type);
+ if (m_data_size > 0)
+ {
+ m_data = new uint8_t[m_data_size];
+ }
}
bgfx_uniform::~bgfx_uniform()
{
- bgfx::destroyUniform(m_handle);
- delete [] m_data;
+ bgfx::destroyUniform(m_handle);
+ delete [] m_data;
}
void bgfx_uniform::upload()
{
if (m_type != bgfx::UniformType::Int1) // Avoid samplers; set separately!
- bgfx::setUniform(m_handle, m_data);
+ bgfx::setUniform(m_handle, m_data);
}
bgfx_uniform* bgfx_uniform::set(float* value)
{
- return set(value, get_size_for_type(bgfx::UniformType::Vec4));
+ return set(value, get_size_for_type(bgfx::UniformType::Vec4));
}
bgfx_uniform* bgfx_uniform::set_int(int value)
{
- return set(&value, get_size_for_type(bgfx::UniformType::Int1));
+ return set(&value, get_size_for_type(bgfx::UniformType::Int1));
}
bgfx_uniform* bgfx_uniform::set_mat3(float* value)
{
- return set(value, get_size_for_type(bgfx::UniformType::Mat3));
+ return set(value, get_size_for_type(bgfx::UniformType::Mat3));
}
bgfx_uniform* bgfx_uniform::set_mat4(float* value)
{
- return set(value, get_size_for_type(bgfx::UniformType::Mat4));
+ return set(value, get_size_for_type(bgfx::UniformType::Mat4));
}
bgfx_uniform* bgfx_uniform::set(void* data, size_t size)
{
- int min_size = (size < m_data_size) ? size : m_data_size;
- memcpy(m_data, data, min_size);
- return this;
+ int min_size = (size < m_data_size) ? size : m_data_size;
+ memcpy(m_data, data, min_size);
+ return this;
}
size_t bgfx_uniform::get_size_for_type(bgfx::UniformType::Enum type)
{
- switch (type)
- {
- case bgfx::UniformType::Vec4:
- return sizeof(float) * 4;
+ switch (type)
+ {
+ case bgfx::UniformType::Vec4:
+ return sizeof(float) * 4;
- case bgfx::UniformType::Int1:
- return sizeof(int);
+ case bgfx::UniformType::Int1:
+ return sizeof(int);
- case bgfx::UniformType::Mat3:
- return sizeof(float) * 3 * 3;
+ case bgfx::UniformType::Mat3:
+ return sizeof(float) * 3 * 3;
- case bgfx::UniformType::Mat4:
- return sizeof(float) * 4 * 4;
+ case bgfx::UniformType::Mat4:
+ return sizeof(float) * 4 * 4;
- default:
- return 0;
- }
-} \ No newline at end of file
+ default:
+ return 0;
+ }
+}
diff --git a/src/osd/modules/render/bgfx/uniform.h b/src/osd/modules/render/bgfx/uniform.h
index 6bb45f50d06..aa4c2cc097a 100644
--- a/src/osd/modules/render/bgfx/uniform.h
+++ b/src/osd/modules/render/bgfx/uniform.h
@@ -18,31 +18,31 @@
class bgfx_uniform
{
public:
- bgfx_uniform(std::string name, bgfx::UniformType::Enum type);
- virtual ~bgfx_uniform();
+ bgfx_uniform(std::string name, bgfx::UniformType::Enum type);
+ virtual ~bgfx_uniform();
- virtual void upload();
+ virtual void upload();
- // Getters
- std::string name() { return m_name; }
- bgfx::UniformType::Enum type() const { return m_type; }
- bgfx::UniformHandle handle() const { return m_handle; }
+ // Getters
+ std::string name() { return m_name; }
+ bgfx::UniformType::Enum type() const { return m_type; }
+ bgfx::UniformHandle handle() const { return m_handle; }
- // Setters
- bgfx_uniform* set(float* value);
- bgfx_uniform* set_int(int value);
- bgfx_uniform* set_mat3(float* value);
- bgfx_uniform* set_mat4(float* value);
- bgfx_uniform* set(void* data, size_t size);
+ // Setters
+ bgfx_uniform* set(float* value);
+ bgfx_uniform* set_int(int value);
+ bgfx_uniform* set_mat3(float* value);
+ bgfx_uniform* set_mat4(float* value);
+ bgfx_uniform* set(void* data, size_t size);
- static size_t get_size_for_type(bgfx::UniformType::Enum type);
+ static size_t get_size_for_type(bgfx::UniformType::Enum type);
protected:
- bgfx::UniformHandle m_handle;
- std::string m_name;
- bgfx::UniformType::Enum m_type;
- uint8_t* m_data;
- size_t m_data_size;
+ bgfx::UniformHandle m_handle;
+ std::string m_name;
+ bgfx::UniformType::Enum m_type;
+ uint8_t* m_data;
+ size_t m_data_size;
};
-#endif // __DRAWBGFX_UNIFORM__ \ No newline at end of file
+#endif // __DRAWBGFX_UNIFORM__
diff --git a/src/osd/modules/render/bgfx/uniformreader.cpp b/src/osd/modules/render/bgfx/uniformreader.cpp
index 863c20e6e4f..141bc657121 100644
--- a/src/osd/modules/render/bgfx/uniformreader.cpp
+++ b/src/osd/modules/render/bgfx/uniformreader.cpp
@@ -10,44 +10,44 @@
#include "uniform.h"
const uniform_reader::string_to_enum uniform_reader::TYPE_NAMES[uniform_reader::TYPE_COUNT] = {
- { "int", bgfx::UniformType::Int1 },
- { "vec4", bgfx::UniformType::Vec4 },
- { "mat3", bgfx::UniformType::Mat3 },
- { "mat4", bgfx::UniformType::Mat4 },
- { "camera", bgfx::UniformType::Mat4 }
+ { "int", bgfx::UniformType::Int1 },
+ { "vec4", bgfx::UniformType::Vec4 },
+ { "mat3", bgfx::UniformType::Mat3 },
+ { "mat4", bgfx::UniformType::Mat4 },
+ { "camera", bgfx::UniformType::Mat4 }
};
bgfx_uniform* uniform_reader::read_from_value(const Value& value)
{
- assert(value.HasMember("name"));
- assert(value["name"].IsString());
- const char* name = value["name"].GetString();
+ assert(value.HasMember("name"));
+ assert(value["name"].IsString());
+ const char* name = value["name"].GetString();
- assert(value.HasMember("type"));
- bgfx::UniformType::Enum type = bgfx::UniformType::Enum(get_enum_from_value(value, "type", bgfx::UniformType::Vec4, TYPE_NAMES, TYPE_COUNT));
- const size_t type_size = bgfx_uniform::get_size_for_type(type);
+ assert(value.HasMember("type"));
+ bgfx::UniformType::Enum type = bgfx::UniformType::Enum(get_enum_from_value(value, "type", bgfx::UniformType::Vec4, TYPE_NAMES, TYPE_COUNT));
+ const size_t type_size = bgfx_uniform::get_size_for_type(type);
- assert(value.HasMember("values"));
- assert(value["values"].IsArray());
- const Value& value_array = value["values"];
- const size_t array_size = value_array.Size() * sizeof(float);
+ assert(value.HasMember("values"));
+ assert(value["values"].IsArray());
+ const Value& value_array = value["values"];
+ const size_t array_size = value_array.Size() * sizeof(float);
- const size_t alloc_size = (type_size > array_size) ? type_size : array_size;
- float* data = reinterpret_cast<float*>(new char[alloc_size]);
+ const size_t alloc_size = (type_size > array_size) ? type_size : array_size;
+ float* data = reinterpret_cast<float*>(new char[alloc_size]);
- unsigned int index = 0;
- for (; index < type_size / 4 && index < value_array.Size(); index++)
- {
- data[index] = (float)value_array[index].GetDouble();
- }
+ unsigned int index = 0;
+ for (; index < type_size / 4 && index < value_array.Size(); index++)
+ {
+ data[index] = (float)value_array[index].GetDouble();
+ }
- for (; index < type_size / 4; index++) {
- data[index] = 0.0f;
- }
+ for (; index < type_size / 4; index++) {
+ data[index] = 0.0f;
+ }
- bgfx_uniform* uniform = new bgfx_uniform(name, type);
- uniform->set((void*)data, type_size);
- delete [] data;
+ bgfx_uniform* uniform = new bgfx_uniform(name, type);
+ uniform->set((void*)data, type_size);
+ delete [] data;
- return uniform;
+ return uniform;
}
diff --git a/src/osd/modules/render/bgfx/uniformreader.h b/src/osd/modules/render/bgfx/uniformreader.h
index ead4bb0cefe..40bedf8b732 100644
--- a/src/osd/modules/render/bgfx/uniformreader.h
+++ b/src/osd/modules/render/bgfx/uniformreader.h
@@ -19,23 +19,23 @@ class bgfx_uniform;
enum uniform_type
{
- TYPE_INT1 = bgfx::UniformType::Int1,
- TYPE_VEC4 = bgfx::UniformType::Vec4,
- TYPE_MAT3 = bgfx::UniformType::Mat3,
- TYPE_MAT4 = bgfx::UniformType::Mat4,
- TYPE_CAMERA, // Alias for the current ortho camera, used to auto-bind on material load
+ TYPE_INT1 = bgfx::UniformType::Int1,
+ TYPE_VEC4 = bgfx::UniformType::Vec4,
+ TYPE_MAT3 = bgfx::UniformType::Mat3,
+ TYPE_MAT4 = bgfx::UniformType::Mat4,
+ TYPE_CAMERA, // Alias for the current ortho camera, used to auto-bind on material load
- TYPE_COUNT = 5
+ TYPE_COUNT = 5
};
class uniform_reader : public state_reader
{
public:
- static bgfx_uniform* read_from_value(const Value& value);
+ static bgfx_uniform* read_from_value(const Value& value);
private:
- static const int TYPE_COUNT = uniform_type::TYPE_COUNT;
- static const string_to_enum TYPE_NAMES[TYPE_COUNT];
+ static const int TYPE_COUNT = uniform_type::TYPE_COUNT;
+ static const string_to_enum TYPE_NAMES[TYPE_COUNT];
};
-#endif // __DRAWBGFX_UNIFORM_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_UNIFORM_READER__
diff --git a/src/osd/modules/render/bgfx/writereader.cpp b/src/osd/modules/render/bgfx/writereader.cpp
index b10220908c8..5d6ca0fcf93 100644
--- a/src/osd/modules/render/bgfx/writereader.cpp
+++ b/src/osd/modules/render/bgfx/writereader.cpp
@@ -3,22 +3,22 @@
#include "writereader.h"
const write_reader::string_to_enum write_reader::RGB_NAMES[write_reader::RGB_COUNT] = {
- { "true", BGFX_STATE_RGB_WRITE },
- { "false", 0 },
- { "1", BGFX_STATE_RGB_WRITE },
- { "0", 0 }
+ { "true", BGFX_STATE_RGB_WRITE },
+ { "false", 0 },
+ { "1", BGFX_STATE_RGB_WRITE },
+ { "0", 0 }
};
const write_reader::string_to_enum write_reader::ALPHA_NAMES[write_reader::ALPHA_COUNT] = {
- { "true", BGFX_STATE_ALPHA_WRITE },
- { "false", 0 },
- { "1", BGFX_STATE_ALPHA_WRITE },
- { "0", 0 }
+ { "true", BGFX_STATE_ALPHA_WRITE },
+ { "false", 0 },
+ { "1", BGFX_STATE_ALPHA_WRITE },
+ { "0", 0 }
};
uint64_t write_reader::read_from_value(const Value& value)
{
- uint64_t rgb = get_enum_from_value(value, "rgb", 0, RGB_NAMES, RGB_COUNT);
- uint64_t alpha = get_enum_from_value(value, "alpha", 0, ALPHA_NAMES, ALPHA_COUNT);
- return rgb | alpha;
+ uint64_t rgb = get_enum_from_value(value, "rgb", 0, RGB_NAMES, RGB_COUNT);
+ uint64_t alpha = get_enum_from_value(value, "alpha", 0, ALPHA_NAMES, ALPHA_COUNT);
+ return rgb | alpha;
}
diff --git a/src/osd/modules/render/bgfx/writereader.h b/src/osd/modules/render/bgfx/writereader.h
index 854505bc9cf..5210a8df286 100644
--- a/src/osd/modules/render/bgfx/writereader.h
+++ b/src/osd/modules/render/bgfx/writereader.h
@@ -7,13 +7,13 @@
class write_reader : public state_reader {
public:
- static uint64_t read_from_value(const Value& value);
+ static uint64_t read_from_value(const Value& value);
private:
- static const int RGB_COUNT = 4;
- static const int ALPHA_COUNT = 4;
- static const string_to_enum RGB_NAMES[RGB_COUNT];
- static const string_to_enum ALPHA_NAMES[ALPHA_COUNT];
+ static const int RGB_COUNT = 4;
+ static const int ALPHA_COUNT = 4;
+ static const string_to_enum RGB_NAMES[RGB_COUNT];
+ static const string_to_enum ALPHA_NAMES[ALPHA_COUNT];
};
-#endif // __DRAWBGFX_WRITE_READER__ \ No newline at end of file
+#endif // __DRAWBGFX_WRITE_READER__