1 files changed, 38 insertions, 23 deletions

diff --git a/src/text.cc b/src/text.cc
index cc06508..58fedad 100644
--- a/src/text.cc
+++ b/src/text.cc
@@ -1,6 +1,7 @@
 #include "text.h"
 
-#include "cglm/types.h"
+#include <cstddef>
+
 #include "freetype/freetype.h"
 #include "shaders.h"
 #include "utils.h"
@@ -14,26 +15,31 @@ static void font_context_sampler_desc(struct sg_sampler_desc* desc) {
   desc->wrap_v = SG_WRAP_CLAMP_TO_EDGE;
 }
 
-static void font_context_layout_attr_pos(
-    struct sg_vertex_attr_state* attr,
-    struct sg_vertex_buffer_layout_state* layout) {
-  wayc_notnull(attr);
+static void font_context_layout(struct sg_vertex_layout_state* layout) {
   wayc_notnull(layout);
 
-  attr->format = SG_VERTEXFORMAT_FLOAT2;
-  attr->buffer_index = 0;
-  layout->stride = sizeof(vec2);
+  layout->buffers[0].stride = sizeof(text_vertex_s);
+
+  layout->attrs[ATTR_text_in_position].format = SG_VERTEXFORMAT_FLOAT2;
+  layout->attrs[ATTR_text_in_position].buffer_index = 0;
+  layout->attrs[ATTR_text_in_position].offset = offsetof(text_vertex_s, pos);
+
+  layout->attrs[ATTR_text_in_uv].format = SG_VERTEXFORMAT_FLOAT2;
+  layout->attrs[ATTR_text_in_uv].buffer_index = 0;
+  layout->attrs[ATTR_text_in_uv].offset = offsetof(text_vertex_s, uv);
 }
 
-static void font_context_layout_attr_uv(
-    struct sg_vertex_attr_state* attr,
-    struct sg_vertex_buffer_layout_state* layout) {
-  wayc_notnull(attr);
-  wayc_notnull(layout);
+static void font_context_color(struct sg_color_target_state* color) {
+  wayc_notnull(color);
+
+  struct sg_blend_state blend = {};
+  blend.enabled = true;
+  blend.src_factor_rgb = SG_BLENDFACTOR_SRC_ALPHA;
+  blend.dst_factor_rgb = SG_BLENDFACTOR_ONE_MINUS_SRC_ALPHA;
+  blend.src_factor_alpha = SG_BLENDFACTOR_SRC_ALPHA;
+  blend.dst_factor_alpha = SG_BLENDFACTOR_ONE_MINUS_SRC_ALPHA;
 
-  attr->format = SG_VERTEXFORMAT_FLOAT2;
-  attr->buffer_index = 0;
-  layout->stride = sizeof(vec2);
+  color->blend = blend;
 }
 
 static void font_context_pipeline_desc(struct sg_pipeline_desc* desc) {
@@ -41,16 +47,19 @@ static void font_context_pipeline_desc(struct sg_pipeline_desc* desc) {
 
   const struct sg_shader_desc* shader_desc =
       text_shader_desc(sg_query_backend());
-  sg_shader shader = sg_make_shader(shader_desc);
+  struct sg_shader shader = sg_make_shader(shader_desc);
 
-  sg_vertex_layout_state vertex_layout = {};
-  font_context_layout_attr_pos(&vertex_layout.attrs[0],
-                               &vertex_layout.buffers[0]);
-  font_context_layout_attr_uv(&vertex_layout.attrs[1],
-                              &vertex_layout.buffers[0]);
+  struct sg_vertex_layout_state vertex_layout = {};
+  font_context_layout(&vertex_layout);
+
+  struct sg_color_target_state color = {};
+  font_context_color(&color);
 
   desc->layout = vertex_layout;
   desc->shader = shader;
+
+  desc->colors[0] = color;
+  desc->color_count = 1;
 }
 
 enum font_context_error_e font_context_init(struct font_context_s* context) {
@@ -73,4 +82,10 @@ enum font_context_error_e font_context_init(struct font_context_s* context) {
   return FONT_CONTEXT_ERROR_NONE;
 }
 
-void font_context_deinit(struct font_context_s* context);
\ No newline at end of file
+void font_context_deinit(struct font_context_s* context) {
+  wayc_notnull(context);
+
+  sg_destroy_pipeline(context->pipeline);
+  sg_destroy_sampler(context->sampler);
+  FT_Done_FreeType(context->ft);
+}
\ No newline at end of file