summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--bgfx/chains/test.json14
-rw-r--r--scripts/src/osd/modules.lua6
-rw-r--r--src/osd/modules/render/bgfx/chain.cpp25
-rw-r--r--src/osd/modules/render/bgfx/chain.h30
-rw-r--r--src/osd/modules/render/bgfx/chainreader.cpp59
-rw-r--r--src/osd/modules/render/bgfx/chainreader.h22
-rw-r--r--src/osd/modules/render/bgfx/parameter.cpp29
-rw-r--r--src/osd/modules/render/bgfx/parameter.h31
-rw-r--r--src/osd/modules/render/bgfx/paramreader.cpp30
-rw-r--r--src/osd/modules/render/bgfx/paramreader.h22
-rw-r--r--src/osd/modules/render/bgfx/slider.cpp57
-rw-r--r--src/osd/modules/render/bgfx/slider.h19
-rw-r--r--src/osd/modules/render/bgfx/sliderreader.cpp66
-rw-r--r--src/osd/modules/render/bgfx/sliderreader.h5
14 files changed, 398 insertions, 17 deletions
diff --git a/bgfx/chains/test.json b/bgfx/chains/test.json
index 0026802d2aa..d5b815ca3fc 100644
--- a/bgfx/chains/test.json
+++ b/bgfx/chains/test.json
@@ -2,14 +2,14 @@
"author": "Ryan Holtz"
"sliders": [
{ "type": "bool", "name": "adjustments", "text": "Enable Adjustments", "default": false },
- { "type": "float", "name": "ratio_amount", "text": "Ratio Amount", "default": 0, "max": 1 },
+ { "type": "float", "name": "ratio_amount", "text": "Ratio Amount", "default": 0, "max": 1, "min": 0 },
- { "type": "color", "name": "red_ratios", "text": "Red Amount", "default": [ 1, 0, 0 ]},
- { "type": "color", "name": "grn_ratios", "text": "Green Amount", "default": [ 0, 1, 0 ], "max": 1, "min": 0 },
- { "type": "color", "name": "blu_ratios", "text": "Blue Amount", "default": [ 0, 0, 1 ], "max": 1, "min": 0 },
- { "type": "color", "name": "tint": "text": "Tint", "default": [ 1, 1, 1 ], "max": 1, "min": 0 }
- { "type": "color", "name": "phosphor", "text": "Phosphor Amount", "default": [ 0, 0, 0 ], "max": 1, "min": 0 },
- { "type": "vec2", "name": "shift", "text": "Frame Shift", "default": [ 0, 0 ], "max": 25, "min": -25 },
+ { "type": "color", "name": "red_ratios", "text": "Red Amount", "default": [ 1, 0, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
+ { "type": "color", "name": "grn_ratios", "text": "Green Amount", "default": [ 0, 1, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
+ { "type": "color", "name": "blu_ratios", "text": "Blue Amount", "default": [ 0, 0, 1 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
+ { "type": "color", "name": "tint": "text": "Tint", "default": [ 1, 1, 1 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] }
+ { "type": "color", "name": "phosphor", "text": "Phosphor Amount", "default": [ 0, 0, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0 ,0 ] },
+ { "type": "vec2", "name": "shift", "text": "Frame Shift", "default": [ 0, 0 ], "max": [ 25, 25 ], "min": [ -25, -25 ] }
]
"parameters": [
{ "name": "alternating", "type": "frame_mask", "period": 2 }
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index bba8678ef9c..1dfa4317a48 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -109,11 +109,17 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/render/bgfx/effect.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/inputpair.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slider.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/sliderreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/parameter.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/target.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/texture.cpp",
diff --git a/src/osd/modules/render/bgfx/chain.cpp b/src/osd/modules/render/bgfx/chain.cpp
new file mode 100644
index 00000000000..faf72cb5797
--- /dev/null
+++ b/src/osd/modules/render/bgfx/chain.cpp
@@ -0,0 +1,25 @@
+#include "slider.h"
+#include "parameter.h"
+#include "chainentry.h"
+
+#include "chain.h"
+
+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)
+ : m_name(name)
+ , m_author(author)
+ , m_sliders(sliders)
+ , m_params(params)
+ , m_entries(entries)
+{
+}
+
+bgfx_chain::~bgfx_chain()
+{
+}
+
+void bgfx_chain::submit(render_primitive* prim, int view)
+{
+ //for (bgfx_chain_entry* entry : m_entries)
+ //{
+ //}
+}
diff --git a/src/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h
new file mode 100644
index 00000000000..b800882a265
--- /dev/null
+++ b/src/osd/modules/render/bgfx/chain.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#ifndef __DRAWBGFX_CHAIN__
+#define __DRAWBGFX_CHAIN__
+
+#include <string>
+#include <vector>
+
+class bgfx_slider;
+class bgfx_parameter;
+class bgfx_chain_entry;
+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();
+
+ 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;
+};
+
+#endif // __DRAWBGFX_CHAIN__ \ No newline at end of file
diff --git a/src/osd/modules/render/bgfx/chainreader.cpp b/src/osd/modules/render/bgfx/chainreader.cpp
new file mode 100644
index 00000000000..44de1c8d0ba
--- /dev/null
+++ b/src/osd/modules/render/bgfx/chainreader.cpp
@@ -0,0 +1,59 @@
+#include <string>
+#include <vector>
+
+#include "emu.h"
+
+#include "chain.h"
+#include "chainreader.h"
+#include "sliderreader.h"
+#include "paramreader.h"
+#include "chainentryreader.h"
+
+bgfx_chain* chain_reader::read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects)
+{
+ validate_parameters(value);
+
+ std::string name = value["name"].GetString();
+ std::string author = value["author"].GetString();
+
+ std::vector<bgfx_slider*> sliders;
+ if (value.HasMember("sliders"))
+ {
+ const Value& slider_array = value["sliders"];
+ for (UINT32 i = 0; i < slider_array.Size(); i++)
+ {
+ sliders.push_back(slider_reader::read_from_value(slider_array[i]));
+ }
+ }
+
+ std::vector<bgfx_parameter*> parameters;
+ if (value.HasMember("parameters"))
+ {
+ const Value& param_array = value["parameters"];
+ for (UINT32 i = 0; i < param_array.Size(); i++)
+ {
+ parameters.push_back(parameter_reader::read_from_value(param_array[i]));
+ }
+ }
+
+ std::vector<bgfx_chain_entry*> entries;
+ if (value.HasMember("passes"))
+ {
+ const Value& entry_array = value["passes"];
+ for (UINT32 i = 0; i < entry_array.Size(); i++)
+ {
+ entries.push_back(chain_entry_reader::read_from_value(entry_array[i], textures, targets, effects));
+ }
+ }
+
+ return new bgfx_chain(name, author, sliders, parameters, entries);
+}
+
+void chain_reader::validate_parameters(const Value& value)
+{
+ assert(value.HasMember("name"));
+ assert(value["name"].IsString());
+ 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
new file mode 100644
index 00000000000..72d91881bc3
--- /dev/null
+++ b/src/osd/modules/render/bgfx/chainreader.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#ifndef __DRAWBGFX_CHAIN_READER__
+#define __DRAWBGFX_CHAIN_READER__
+
+#include "statereader.h"
+
+class bgfx_chain;
+class texture_manager;
+class target_manager;
+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);
+
+private:
+ static void validate_parameters(const Value& value);
+};
+
+#endif // __DRAWBGFX_CHAIN_READER__ \ No newline at end of file
diff --git a/src/osd/modules/render/bgfx/parameter.cpp b/src/osd/modules/render/bgfx/parameter.cpp
new file mode 100644
index 00000000000..d7800974089
--- /dev/null
+++ b/src/osd/modules/render/bgfx/parameter.cpp
@@ -0,0 +1,29 @@
+#include "emu.h"
+
+#include "parameter.h"
+
+bgfx_parameter::bgfx_parameter(std::string name, parameter_type type, int period)
+ : m_name(name)
+ , m_type(type)
+ , m_period(period)
+ , m_frame(0)
+{
+}
+
+bgfx_parameter::~bgfx_parameter()
+{
+}
+
+void bgfx_parameter::frame()
+{
+ m_frame++;
+ if (m_frame == m_period)
+ {
+ m_frame = 0;
+ }
+}
+
+bool bgfx_parameter::active()
+{
+ return (m_frame % m_period == 0);
+}
diff --git a/src/osd/modules/render/bgfx/parameter.h b/src/osd/modules/render/bgfx/parameter.h
new file mode 100644
index 00000000000..c38b80746a7
--- /dev/null
+++ b/src/osd/modules/render/bgfx/parameter.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#ifndef __DRAWBGFX_PARAMETER__
+#define __DRAWBGFX_PARAMETER__
+
+#include <string>
+
+#include "emu.h"
+
+class bgfx_parameter
+{
+public:
+ enum parameter_type
+ {
+ PARAM_FRAME_MASK
+ };
+
+ bgfx_parameter(std::string name, parameter_type type, int period);
+ ~bgfx_parameter();
+
+ void frame();
+ bool active();
+
+private:
+ std::string m_name;
+ parameter_type m_type;
+ UINT32 m_period;
+ UINT32 m_frame;
+};
+
+#endif // __DRAWBGFX_PARAMETER__ \ No newline at end of file
diff --git a/src/osd/modules/render/bgfx/paramreader.cpp b/src/osd/modules/render/bgfx/paramreader.cpp
new file mode 100644
index 00000000000..7d0dad85697
--- /dev/null
+++ b/src/osd/modules/render/bgfx/paramreader.cpp
@@ -0,0 +1,30 @@
+#include <string>
+
+#include "paramreader.h"
+
+#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) }
+};
+
+bgfx_parameter* parameter_reader::read_from_value(const Value& 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));
+ int period = int(value["period"].GetDouble());
+
+ return new bgfx_parameter(name, type, period);
+}
+
+void parameter_reader::validate_parameters(const Value& value)
+{
+ assert(value.HasMember("name"));
+ assert(value["name"].IsString());
+ assert(value.HasMember("type"));
+ 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
new file mode 100644
index 00000000000..e8543d39c79
--- /dev/null
+++ b/src/osd/modules/render/bgfx/paramreader.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#ifndef __DRAWBGFX_PARAM_READER__
+#define __DRAWBGFX_PARAM_READER__
+
+#include "statereader.h"
+
+class bgfx_parameter;
+
+class parameter_reader : public state_reader
+{
+public:
+ static bgfx_parameter* read_from_value(const Value& value);
+
+private:
+ static void validate_parameters(const Value& value);
+
+ 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
diff --git a/src/osd/modules/render/bgfx/slider.cpp b/src/osd/modules/render/bgfx/slider.cpp
new file mode 100644
index 00000000000..60445ffd6cb
--- /dev/null
+++ b/src/osd/modules/render/bgfx/slider.cpp
@@ -0,0 +1,57 @@
+#include "emu.h"
+
+#include "slider.h"
+
+bgfx_slider::bgfx_slider(slider_type type, std::string name, std::string description, void *defaults, void *min, void *max)
+ : m_type(type)
+ , m_name(name)
+ , m_description(description)
+{
+ m_data = global_alloc_array_clear<char>(storage_size(type));
+ m_min = global_alloc_array_clear<char>(storage_size(type));
+ m_max = global_alloc_array_clear<char>(storage_size(type));
+ memcpy(m_data, defaults, size(type));
+ memcpy(m_min, min, size(type));
+ memcpy(m_max, max, size(type));
+}
+
+bgfx_slider::~bgfx_slider()
+{
+ global_free(m_data);
+ global_free(m_min);
+ global_free(m_max);
+}
+
+size_t bgfx_slider::storage_size(slider_type type)
+{
+ switch(type)
+ {
+ case SLIDER_INT:
+ return 1 * sizeof(int);
+ case SLIDER_BOOL:
+ case SLIDER_FLOAT:
+ case SLIDER_COLOR:
+ case SLIDER_VEC2:
+ return 4 * sizeof(float);
+ default:
+ return 0;
+ }
+}
+
+size_t bgfx_slider::size(slider_type type)
+{
+ switch(type)
+ {
+ case SLIDER_INT:
+ return sizeof(int);
+ case SLIDER_BOOL:
+ case SLIDER_FLOAT:
+ return sizeof(float);
+ case SLIDER_COLOR:
+ return sizeof(float) * 3;
+ case SLIDER_VEC2:
+ return sizeof(float) * 2;
+ default:
+ return 0;
+ }
+}
diff --git a/src/osd/modules/render/bgfx/slider.h b/src/osd/modules/render/bgfx/slider.h
index d0bcc97aaf0..ab570e7724a 100644
--- a/src/osd/modules/render/bgfx/slider.h
+++ b/src/osd/modules/render/bgfx/slider.h
@@ -14,9 +14,6 @@
class bgfx_slider
{
public:
- bgfx_slider(slider_type type, std::string name, std::string description, void *defaults, void *min, void *max);
- ~bgfx_slider();
-
enum slider_type
{
SLIDER_BOOL,
@@ -26,15 +23,19 @@ public:
SLIDER_VEC2
};
- // Getters
- bgfx_uniform* uniform(std::string name);
- bgfx::ProgramHandle get_program() const { return m_program_handle; }
+ 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);
protected:
+
+ slider_type m_type;
std::string m_name;
- void * m_data;
- void * m_min;
- void * m_max;
+ std::string m_description;
+ char* m_data;
+ char* m_min;
+ char* m_max;
};
#endif // __DRAWBGFX_SLIDER__ \ No newline at end of file
diff --git a/src/osd/modules/render/bgfx/sliderreader.cpp b/src/osd/modules/render/bgfx/sliderreader.cpp
new file mode 100644
index 00000000000..55b352b8f54
--- /dev/null
+++ b/src/osd/modules/render/bgfx/sliderreader.cpp
@@ -0,0 +1,66 @@
+#include "emu.h"
+
+#include "sliderreader.h"
+
+#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) }
+};
+
+bgfx_slider* slider_reader::read_from_value(const Value& 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();
+ std::string description = value["text"].GetString();
+
+ float defaults[4];
+ float min[4];
+ float max[4];
+ get_values(value, "default", defaults);
+ get_values(value, "min", min);
+ get_values(value, "max", max);
+
+ return new bgfx_slider(type, name, description, defaults, min, max);
+}
+
+void slider_reader::get_values(const Value& value, std::string name, float* values)
+{
+ const char* name_str = name.c_str();
+ if (value.HasMember(name_str))
+ {
+ if (value[name_str].IsBool())
+ {
+ values[0] = value[name_str].GetBool() ? 1.0f : 0.0f;
+ }
+ else if (value[name_str].IsDouble())
+ {
+ values[0] = float(value[name_str].GetDouble());
+ }
+ else
+ {
+ const Value& value_array = value[name_str];
+ for (UINT32 i = 0; i < value_array.Size() && i < 4; i++)
+ {
+ values[i] = float(value_array[i].GetDouble());
+ }
+ }
+ }
+}
+
+void slider_reader::validate_parameters(const Value& value)
+{
+ assert(value.HasMember("type"));
+ assert(value["type"].IsString());
+ assert(value.HasMember("name"));
+ assert(value["name"].IsString());
+ 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 c7e8c315dfe..82807c221f8 100644
--- a/src/osd/modules/render/bgfx/sliderreader.h
+++ b/src/osd/modules/render/bgfx/sliderreader.h
@@ -6,7 +6,6 @@
#include "statereader.h"
class bgfx_slider;
-class shader_manager;
class slider_reader : public state_reader
{
@@ -14,7 +13,11 @@ public:
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 const int TYPE_COUNT = 5;
+ static const string_to_enum TYPE_NAMES[TYPE_COUNT];
};
#endif // __DRAWBGFX_SLIDER_READER__ \ No newline at end of file