diff options
author | 2016-03-02 00:31:40 +0100 | |
---|---|---|
committer | 2016-03-13 15:51:15 +0100 | |
commit | 3172371fcd26285582a8595dd0b5d5d9193fcf4c (patch) | |
tree | 098668a732844d61ba60a1b32b6b66c658450967 /src/osd/modules/render/bgfx/effect.cpp | |
parent | db72f23b7c31eb8eea969c31926bc25cca072864 (diff) |
More work on bgfx data-driven shaders, 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); } |