diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2018-08-16 18:48:20 +0300 |
|---|---|---|
| committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2018-08-17 13:11:53 +0300 |
| commit | 04c0ffbab4df4bee1e229474787b98feb4d6ae06 (patch) | |
| tree | 702742ea61542b85e400e7aa34540d7894dd93de /drape/render_state.cpp | |
| parent | 5ab189afac15e9e97aef702e69e0d883bc8532b9 (diff) | |
Review fixes.
Diffstat (limited to 'drape/render_state.cpp')
| -rw-r--r-- | drape/render_state.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drape/render_state.cpp b/drape/render_state.cpp index 93ea2a52f1..a6efc153b7 100644 --- a/drape/render_state.cpp +++ b/drape/render_state.cpp @@ -14,14 +14,14 @@ glConst DecodeTestFunction(TestFunction depthFunction) { switch (depthFunction) { - case TestFunction::Never: return gl_const::GLNever; - case TestFunction::Less: return gl_const::GLLess; - case TestFunction::Equal: return gl_const::GLEqual; - case TestFunction::LessOrEqual: return gl_const::GLLessOrEqual; - case TestFunction::Greater: return gl_const::GLGreat; - case TestFunction::NotEqual: return gl_const::GLNotEqual; - case TestFunction::GreaterOrEqual: return gl_const::GLGreatOrEqual; - case TestFunction::Always: return gl_const::GLAlways; + case TestFunction::Never: return gl_const::GLNever; + case TestFunction::Less: return gl_const::GLLess; + case TestFunction::Equal: return gl_const::GLEqual; + case TestFunction::LessOrEqual: return gl_const::GLLessOrEqual; + case TestFunction::Greater: return gl_const::GLGreat; + case TestFunction::NotEqual: return gl_const::GLNotEqual; + case TestFunction::GreaterOrEqual: return gl_const::GLGreatOrEqual; + case TestFunction::Always: return gl_const::GLAlways; } CHECK_SWITCH(); } @@ -215,7 +215,7 @@ void ApplyBlending(RenderState const & state) state.GetBlending().Apply(); } -void ApplyState(RenderState const & state, ref_ptr<GraphicsContext> context, ref_ptr<GpuProgram> program) +void ApplyState(ref_ptr<GraphicsContext> context, ref_ptr<GpuProgram> program, RenderState const & state) { TextureState::ApplyTextures(state, program); ApplyBlending(state); |