fix shader for iOS, remove switch to if-else sequence

2017-12-06 00:32:15 +00:00
parent 9978709645
commit d18b1103bb
4 changed files with 36 additions and 23 deletions
--- a/engine/canvas.cpp
+++ b/engine/canvas.cpp
@@ -240,7 +240,9 @@ void ui::Canvas::stroke_draw()
            glDisable(GL_BLEND);
            ShaderManager::use(ui::kShader::Stroke);
            ShaderManager::u_int(kShaderUniform::Tex, 0); // brush
+            #ifndef __IOS__
            ShaderManager::u_int(kShaderUniform::TexBG, 1); // bg
+            #endif
            //ShaderManager::u_int(kShaderUniform::TexStencil, 3); // stencil
            ShaderManager::u_vec4(kShaderUniform::Col, m_brush.m_tip_color);
            ShaderManager::u_vec2(kShaderUniform::Resolution, { m_width, m_height });