Route remaining shader setup through helpers

This commit is contained in:
2026-06-13 06:22:39 +02:00
parent 05b721bce6
commit 493282264d
9 changed files with 132 additions and 64 deletions

View File

@@ -16,6 +16,18 @@ struct LegacyCanvasDrawMergeTextureUniforms {
int texture_slot = 0;
};
struct LegacyCanvasDrawMergeAtlasUniforms {
glm::mat4 mvp { 1.0f };
int texture_slot = 0;
glm::vec2 offset {};
glm::vec2 size { 1.0f };
};
struct LegacyCanvasDrawMergeEquirectUniforms {
glm::mat4 mvp { 1.0f };
int texture_slot = 0;
};
struct LegacyCanvasDrawMergeTextureMaskUniforms {
int texture_slot = 0;
glm::vec2 pattern_offset {};
@@ -106,6 +118,38 @@ 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_atlas_shader(
const LegacyCanvasDrawMergeAtlasUniforms& uniforms,
const LegacyCanvasDrawMergeShaderExecution& execution) noexcept
{
execution.use_shader(kShader::Atlas);
execution.set_vec2(kShaderUniform::Tof, uniforms.offset);
execution.set_vec2(kShaderUniform::Tsz, uniforms.size);
execution.set_int(kShaderUniform::Tex, uniforms.texture_slot);
execution.set_mat4(kShaderUniform::MVP, uniforms.mvp);
}
inline void setup_legacy_canvas_draw_merge_atlas_shader(
const LegacyCanvasDrawMergeAtlasUniforms& uniforms)
{
setup_legacy_canvas_draw_merge_atlas_shader(uniforms, legacy_shader_manager_draw_merge_execution());
}
inline void setup_legacy_canvas_draw_merge_equirect_shader(
const LegacyCanvasDrawMergeEquirectUniforms& uniforms,
const LegacyCanvasDrawMergeShaderExecution& execution) noexcept
{
execution.use_shader(kShader::Equirect);
execution.set_mat4(kShaderUniform::MVP, uniforms.mvp);
execution.set_int(kShaderUniform::Tex, uniforms.texture_slot);
}
inline void setup_legacy_canvas_draw_merge_equirect_shader(
const LegacyCanvasDrawMergeEquirectUniforms& uniforms)
{
setup_legacy_canvas_draw_merge_equirect_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