From 899ad4c030d58831a9698e30dcd09e0934c4ed40 Mon Sep 17 00:00:00 2001
From: martinfouilleul <martinfouilleul@gmail.com>
Date: Mon, 3 Jul 2023 11:02:04 +0200
Subject: [PATCH] [wip, win32, canvas] Correctly setup path index in
 segment_setup.glsl

---
 examples/polygon/main.c             |  4 ++++
 src/glsl_shaders/raster.glsl        |  3 ---
 src/glsl_shaders/segment_setup.glsl | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/examples/polygon/main.c b/examples/polygon/main.c
index f3ea8d7..c44f71e 100644
--- a/examples/polygon/main.c
+++ b/examples/polygon/main.c
@@ -116,6 +116,10 @@ int main()
 			mg_close_path();
 			mg_set_color_rgba(0, 1, 0, 1);
 			mg_fill();
+
+			mg_set_color_rgba(0, 1, 1, 1);
+			mg_rectangle_fill(120, 120, 200, 200);
+
 /*
 			mg_move_to(400, 400);
 			mg_quadratic_to(600, 601, 800, 400);
diff --git a/src/glsl_shaders/raster.glsl b/src/glsl_shaders/raster.glsl
index d6f5bb0..7e7e82f 100644
--- a/src/glsl_shaders/raster.glsl
+++ b/src/glsl_shaders/raster.glsl
@@ -150,9 +150,6 @@ void main()
 
 	while(opIndex >= 0)
 	{
-//		imageStore(outTexture, ivec2(sampleCoord), vec4(0, 1, 1, 1));
-//		return;
-
 		mg_gl_tile_op op = tileOpBuffer.elements[opIndex];
 		opIndex = op.next;
 
diff --git a/src/glsl_shaders/segment_setup.glsl b/src/glsl_shaders/segment_setup.glsl
index 6bc9007..bdac007 100644
--- a/src/glsl_shaders/segment_setup.glsl
+++ b/src/glsl_shaders/segment_setup.glsl
@@ -42,7 +42,7 @@ layout(binding = 6) restrict buffer tileOpBufferSSBO
 layout(location = 0) uniform float scale;
 layout(location = 1) uniform uint tileSize;
 
-int push_segment(in vec2 p[4], int kind)
+int push_segment(in vec2 p[4], int kind, int pathIndex)
 {
 	int segIndex = atomicAdd(segmentCountBuffer.elements[0], 1);
 
@@ -59,7 +59,7 @@ int push_segment(in vec2 p[4], int kind)
 	                max(s.y, e.y));
 
 	segmentBuffer.elements[segIndex].kind = kind;
-	segmentBuffer.elements[segIndex].pathIndex = 0; ///
+	segmentBuffer.elements[segIndex].pathIndex = pathIndex;
 	segmentBuffer.elements[segIndex].windingIncrement = goingUp ? 1 : -1;
 	segmentBuffer.elements[segIndex].box = box;
 
@@ -288,9 +288,9 @@ void bin_to_tiles(int segIndex)
 	}
 }
 
-void line_setup(vec2 p[4])
+void line_setup(vec2 p[4], int pathIndex)
 {
-	int segIndex = push_segment(p, MG_GL_LINE);
+	int segIndex = push_segment(p, MG_GL_LINE, pathIndex);
 	segmentBuffer.elements[segIndex].hullVertex = p[0];
 
 	bin_to_tiles(segIndex);
@@ -307,7 +307,7 @@ void main()
 		case MG_GL_LINE:
 		{
 			vec2 p[4] = {elt.p[0]*scale, elt.p[1]*scale, vec2(0), vec2(0)};
-			line_setup(p);
+			line_setup(p, elt.pathIndex);
 		} break;
 
 		default: