Route colorize mask and slider shader setup through helpers

src/legacy_canvas_draw_merge_services.h

@@ -16,6 +16,11 @@ struct LegacyCanvasDrawMergeTextureUniforms {
     int texture_slot = 0;
 };
 
+struct LegacyCanvasDrawMergeTextureMaskUniforms {
+    int texture_slot = 0;
+    glm::vec2 pattern_offset {};
+};
+
 struct LegacyCanvasDrawMergeTextureAlphaUniforms {
     glm::mat4 mvp { 1.0f };
     int texture_slot = 0;
@@ -32,10 +37,18 @@ struct LegacyCanvasDrawMergeTextureBlendUniforms {
     float alpha = 1.0f;
 };
 
+struct LegacyCanvasDrawMergeTextureColorizeUniforms {
+    glm::mat4 mvp { 1.0f };
+    int texture_slot = 0;
+    glm::vec4 color { 1.0f };
+};
+
 struct LegacyCanvasDrawMergeShaderExecution {
     std::function<void(kShader)> use_shader;
     std::function<void(kShaderUniform, int)> set_int;
     std::function<void(kShaderUniform, float)> set_float;
+    std::function<void(kShaderUniform, const glm::vec2&)> set_vec2;
+    std::function<void(kShaderUniform, const glm::vec4&)> set_vec4;
     std::function<void(kShaderUniform, const glm::mat4&)> set_mat4;
 };
 
@@ -45,10 +58,24 @@ struct LegacyCanvasDrawMergeShaderExecution {
         .use_shader = [](kShader shader) { ShaderManager::use(shader); },
         .set_int = [](kShaderUniform uniform, int value) { ShaderManager::u_int(uniform, value); },
         .set_float = [](kShaderUniform uniform, float value) { ShaderManager::u_float(uniform, value); },
+        .set_vec2 = [](kShaderUniform uniform, const glm::vec2& value) { ShaderManager::u_vec2(uniform, value); },
+        .set_vec4 = [](kShaderUniform uniform, const glm::vec4& value) { ShaderManager::u_vec4(uniform, value); },
         .set_mat4 = [](kShaderUniform uniform, const glm::mat4& value) { ShaderManager::u_mat4(uniform, value); },
     };
 }
 
+inline void apply_legacy_canvas_draw_merge_mvp(
+    const glm::mat4& mvp,
+    const LegacyCanvasDrawMergeShaderExecution& execution) noexcept
+{
+    execution.set_mat4(kShaderUniform::MVP, mvp);
+}
+
+inline void apply_legacy_canvas_draw_merge_mvp(const glm::mat4& mvp)
+{
+    apply_legacy_canvas_draw_merge_mvp(mvp, legacy_shader_manager_draw_merge_execution());
+}
+
 inline void setup_legacy_canvas_draw_merge_checkerboard_shader(
     const LegacyCanvasDrawMergeCheckerboardUniforms& uniforms,
     const LegacyCanvasDrawMergeShaderExecution& execution) noexcept
@@ -79,6 +106,21 @@ inline void setup_legacy_canvas_draw_merge_texture_shader(
     setup_legacy_canvas_draw_merge_texture_shader(uniforms, legacy_shader_manager_draw_merge_execution());
 }
 
+inline void setup_legacy_canvas_draw_merge_texture_mask_shader(
+    const LegacyCanvasDrawMergeTextureMaskUniforms& uniforms,
+    const LegacyCanvasDrawMergeShaderExecution& execution) noexcept
+{
+    execution.use_shader(kShader::TextureMask);
+    execution.set_int(kShaderUniform::Tex, uniforms.texture_slot);
+    execution.set_vec2(kShaderUniform::PatternOffset, uniforms.pattern_offset);
+}
+
+inline void setup_legacy_canvas_draw_merge_texture_mask_shader(
+    const LegacyCanvasDrawMergeTextureMaskUniforms& uniforms)
+{
+    setup_legacy_canvas_draw_merge_texture_mask_shader(uniforms, legacy_shader_manager_draw_merge_execution());
+}
+
 inline void setup_legacy_canvas_draw_merge_texture_alpha_shader(
     const LegacyCanvasDrawMergeTextureAlphaUniforms& uniforms,
     const LegacyCanvasDrawMergeShaderExecution& execution) noexcept
@@ -116,4 +158,20 @@ inline void setup_legacy_canvas_draw_merge_texture_blend_shader(
     setup_legacy_canvas_draw_merge_texture_blend_shader(uniforms, legacy_shader_manager_draw_merge_execution());
 }
 
+inline void setup_legacy_canvas_draw_merge_texture_colorize_shader(
+    const LegacyCanvasDrawMergeTextureColorizeUniforms& uniforms,
+    const LegacyCanvasDrawMergeShaderExecution& execution) noexcept
+{
+    execution.use_shader(kShader::TextureColorize);
+    execution.set_int(kShaderUniform::Tex, uniforms.texture_slot);
+    execution.set_vec4(kShaderUniform::Col, uniforms.color);
+    execution.set_mat4(kShaderUniform::MVP, uniforms.mvp);
+}
+
+inline void setup_legacy_canvas_draw_merge_texture_colorize_shader(
+    const LegacyCanvasDrawMergeTextureColorizeUniforms& uniforms)
+{
+    setup_legacy_canvas_draw_merge_texture_colorize_shader(uniforms, legacy_shader_manager_draw_merge_execution());
+}
+
 } // namespace pp::panopainter