diff options
author | 2016-03-23 17:55:55 +0100 | |
---|---|---|
committer | 2016-03-23 17:55:55 +0100 | |
commit | ba0a1d8d5218804bc1d5b09d5b3fa8fcd537f0bf (patch) | |
tree | 9fe5ca6f9f6352f724ea9a26fff5ebda23576607 /src/osd/modules/render/bgfx/effect.cpp | |
parent | d0867ac3f2bdcfd4d1d2361ce8b6408a185908f4 (diff) | |
parent | 5ed9f938ea322d386e949d2752892651d9ee9fde (diff) |
Merge bgfx_shader into master, nw
Diffstat (limited to 'src/osd/modules/render/bgfx/effect.cpp')
-rw-r--r-- | src/osd/modules/render/bgfx/effect.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/osd/modules/render/bgfx/effect.cpp b/src/osd/modules/render/bgfx/effect.cpp index 98bf317a50c..9431c0bcba9 100644 --- a/src/osd/modules/render/bgfx/effect.cpp +++ b/src/osd/modules/render/bgfx/effect.cpp @@ -8,6 +8,8 @@ #include "effect.h" +#include "uniform.h" + bgfx_effect::bgfx_effect(uint64_t state, bgfx::ShaderHandle vertex_shader, bgfx::ShaderHandle fragment_shader, std::vector<bgfx_uniform*> uniforms) : m_state(state) { @@ -29,13 +31,13 @@ bgfx_effect::~bgfx_effect() bgfx::destroyProgram(m_program_handle); } -void bgfx_effect::submit(int view) +void bgfx_effect::submit(int view, uint64_t blend) { for (std::pair<std::string, bgfx_uniform*> uniform_pair : m_uniforms) { (uniform_pair.second)->upload(); } - bgfx::setState(m_state); + bgfx::setState(m_state | blend); bgfx::submit(view, m_program_handle); } |