hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

[mtl canvas, wip] Re-introducing quadratics implicitization

This commit is contained in:
Martin Fouilleul 2023-03-30 15:58:46 +02:00
parent eee158ff85
commit 93998852bb
4 changed files with 356 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/polygon/main.c
View File

@ -73,7 +73,7 @@ int main()
// background
mg_set_color_rgba(0, 1, 1, 1);
mg_clear();
/*
mg_move_to(100, 100);
mg_line_to(150, 150);
mg_line_to(100, 200);
@ -89,7 +89,12 @@ int main()
mg_close_path();
mg_set_color_rgba(0, 1, 0, 1);
mg_fill();
*/
mg_move_to(400, 400);
mg_quadratic_to(600, 600, 800, 400);
mg_close_path();
mg_set_color_rgba(0, 0, 1, 1);
mg_fill();
printf("Milepost vector graphics test program (frame time = %fs, fps = %f)...\n",
frameTime,

7
src/mtl_renderer.h
View File

@ -25,6 +25,8 @@ typedef struct mg_mtl_path
typedef enum {
MG_MTL_LINE = 1,
MG_MTL_QUADRATIC,
MG_MTL_CUBIC,
} mg_mtl_seg_kind;
typedef struct mg_mtl_path_elt
@ -43,10 +45,15 @@ typedef enum {
typedef struct mg_mtl_segment
{
mg_mtl_seg_kind kind;
int pathIndex;
mg_mtl_seg_config config; //TODO pack these
int windingIncrement;
vector_float4 box;
matrix_float3x3 implicitMatrix;
int debugID;
} mg_mtl_segment;
typedef struct mg_mtl_path_queue

47
src/mtl_renderer.m
View File

@ -100,6 +100,10 @@ void mg_mtl_canvas_render(mg_canvas_backend* interface,
}
else if(elt->type == MG_PATH_LINE)
{
/////////////////////////////////////////////////////////////////////////////////////
//TODO: order control points so that we can collapse all elements into same codepath
/////////////////////////////////////////////////////////////////////////////////////
//NOTE: transform and push path elt + update primitive bounding box
vec2 p0 = mg_mat2x3_mul(primitive->attributes.transform, currentPos);
vec2 p3 = mg_mat2x3_mul(primitive->attributes.transform, elt->p[0]);
@ -116,6 +120,49 @@ void mg_mtl_canvas_render(mg_canvas_backend* interface,
mtlElt->p[0] = (vector_float2){p0.x, p0.y};
mtlElt->p[3] = (vector_float2){p3.x, p3.y};
}
else if(elt->type == MG_PATH_QUADRATIC)
{
vec2 p0 = mg_mat2x3_mul(primitive->attributes.transform, currentPos);
vec2 p1 = mg_mat2x3_mul(primitive->attributes.transform, elt->p[0]);
vec2 p3 = mg_mat2x3_mul(primitive->attributes.transform, elt->p[1]);
currentPos = elt->p[1];
mg_update_path_extents(&pathExtents, p0);
mg_update_path_extents(&pathExtents, p1);
mg_update_path_extents(&pathExtents, p3);
mg_mtl_path_elt* mtlElt = &elementBufferData[mtlEltCount];
mtlEltCount++;
mtlElt->pathIndex = primitiveIndex;
mtlElt->kind = (mg_mtl_seg_kind)elt->type;
mtlElt->p[0] = (vector_float2){p0.x, p0.y};
mtlElt->p[1] = (vector_float2){p1.x, p1.y};
mtlElt->p[3] = (vector_float2){p3.x, p3.y};
}
else if(elt->type == MG_PATH_CUBIC)
{
vec2 p0 = mg_mat2x3_mul(primitive->attributes.transform, currentPos);
vec2 p1 = mg_mat2x3_mul(primitive->attributes.transform, elt->p[0]);
vec2 p2 = mg_mat2x3_mul(primitive->attributes.transform, elt->p[1]);
vec2 p3 = mg_mat2x3_mul(primitive->attributes.transform, elt->p[2]);
currentPos = elt->p[2];
mg_update_path_extents(&pathExtents, p0);
mg_update_path_extents(&pathExtents, p1);
mg_update_path_extents(&pathExtents, p2);
mg_update_path_extents(&pathExtents, p3);
mg_mtl_path_elt* mtlElt = &elementBufferData[mtlEltCount];
mtlEltCount++;
mtlElt->pathIndex = primitiveIndex;
mtlElt->kind = (mg_mtl_seg_kind)elt->type;
mtlElt->p[0] = (vector_float2){p0.x, p0.y};
mtlElt->p[1] = (vector_float2){p1.x, p1.y};
mtlElt->p[1] = (vector_float2){p2.x, p2.y};
mtlElt->p[3] = (vector_float2){p3.x, p3.y};
}
}
//NOTE: push path

312
src/mtl_renderer.metal
View File

@ -76,58 +76,45 @@ bool mtl_is_left_of_segment(float2 p, const device mg_mtl_segment* seg)
else if( !(seg->config == MG_MTL_TL && dy < alpha*dx)
&& !(seg->config == MG_MTL_BL && dy > ofs - alpha*dx))
{
//Need implicit test, but for lines, we only have config BR or TR, so the test is always negative for now
//NOTE: for lines, we only have config BR or TR, so the test is always negative
if(seg->kind == MG_MTL_QUADRATIC)
{
/*
//DEBUG: behave as a straight line segment
if((seg->config == MG_MTL_BL || seg->config == MG_MTL_TL))
{
isLeft = true;
}
/*/
float3 ph = {p.x, p.y, 1};
float3 klm = seg->implicitMatrix * ph;
if((klm.x*klm.x - klm.y)*klm.z < 0)
{
isLeft = true;
}
//*/
}
}
}
return(isLeft);
}
kernel void mtl_segment_setup(constant int* elementCount [[buffer(0)]],
const device mg_mtl_path_elt* elementBuffer [[buffer(1)]],
device atomic_int* segmentCount [[buffer(2)]],
device mg_mtl_segment* segmentBuffer [[buffer(3)]],
const device mg_mtl_path_queue* pathQueueBuffer [[buffer(4)]],
device mg_mtl_tile_queue* tileQueueBuffer [[buffer(5)]],
device mg_mtl_tile_op* tileOpBuffer [[buffer(6)]],
device atomic_int* tileOpCount [[buffer(7)]],
constant int* tileSize [[buffer(8)]],
uint eltIndex [[thread_position_in_grid]])
void mtl_bin_segment_to_tiles(int segIndex,
device mg_mtl_segment* seg,
const device mg_mtl_path_queue* pathQueueBuffer,
device mg_mtl_tile_queue* tileQueueBuffer,
device mg_mtl_tile_op* tileOpBuffer,
device atomic_int* tileOpCount,
int tileSize)
{
const device mg_mtl_path_elt* elt = &elementBuffer[eltIndex];
float2 p0 = elt->p[0];
float2 p3 = elt->p[3];
if(elt->kind == MG_MTL_LINE)
{
int segIndex = atomic_fetch_add_explicit(segmentCount, 1, memory_order_relaxed);
device mg_mtl_segment* seg = &segmentBuffer[segIndex];
seg->pathIndex = elt->pathIndex;
seg->box = (vector_float4){min(p0.x, p3.x),
min(p0.y, p3.y),
max(p0.x, p3.x),
max(p0.y, p3.y)};
if( (p3.x > p0.x && p3.y < p0.y)
||(p3.x <= p0.x && p3.y > p0.y))
{
seg->config = MG_MTL_TR;
}
else if( (p3.x > p0.x && p3.y >= p0.y)
||(p3.x <= p0.x && p3.y <= p0.y))
{
//NOTE: it is important to include horizontal segments here, so that the mtl_is_left_of_segment() test
// becomes x > seg->box.x, in order to correctly detect right-crossing horizontal segments
seg->config = MG_MTL_BR;
}
seg->windingIncrement = (p3.y > p0.y)? 1 : -1;
//NOTE: add segment index to the queues of tiles it overlaps with
const device mg_mtl_path_queue* pathQueue = &pathQueueBuffer[seg->pathIndex];
device mg_mtl_tile_queue* tileQueues = &tileQueueBuffer[pathQueue->tileQueues];
int4 coveredTiles = int4(seg->box)/tileSize[0];
int4 coveredTiles = int4(seg->box)/tileSize;
int xMin = max(0, coveredTiles.x - pathQueue->area.x);
int yMin = max(0, coveredTiles.y - pathQueue->area.y);
int xMax = min(coveredTiles.z - pathQueue->area.x, pathQueue->area.z-1);
@ -140,7 +127,7 @@ kernel void mtl_segment_setup(constant int* elementCount [[buffer(0)]],
float4 tileBox = (float4){float(x + pathQueue->area.x),
float(y + pathQueue->area.y),
float(x + pathQueue->area.x + 1),
float(y + pathQueue->area.y + 1)} * float(tileSize[0]);
float(y + pathQueue->area.y + 1)} * float(tileSize);
//NOTE: select two corners of tile box to test against the curve
float2 testPoint0;
@ -218,6 +205,213 @@ kernel void mtl_segment_setup(constant int* elementCount [[buffer(0)]],
}
}
}
int mtl_quadratic_monotonize(float2 p[3], float2 sp[9])
{
//NOTE: compute split points
int count = 0;
float splitPoints[4];
splitPoints[0] = 0;
count++;
float2 r = (p[0] - p[1])/(p[2] - 2*p[1] + p[0]);
if(r.x > r.y)
{
float tmp = r.x;
r.x = r.y;
r.y = tmp;
}
if(r.x > 0 && r.x < 1)
{
splitPoints[count] = r.x;
count++;
}
if(r.y > 0 && r.y < 1)
{
splitPoints[count] = r.y;
count++;
}
splitPoints[count] = 1;
count++;
for(int i=0; i<count-1; i++)
{
//NOTE cut curve between splitPoint[i] and splitPoint[i+1]
float z0 = splitPoints[i];
float z1 = splitPoints[i+1];
float zr = (z1-z0)/(1-z0);
float2 q0 = (z0-1)*(z0-1)*p[0]
- 2*(z0-1)*z0*p[1]
+ z0*z0*p[2];
float2 q1 = (z0-1)*(z0-1)*(1-zr)*p[0]
+ ((1-z0)*zr - 2*(z0-1)*(1-zr)*z0)*p[1]
+ (z0*z0*(1-zr) + z0*zr)*p[2];
float2 q2 = (z0-1)*(z0-1)*(1-zr)*(1-zr)*p[0]
- 2*((z0-1)*z0*(zr-1)*(zr-1)+ (1-z0)*(zr-1)*zr)*p[1]
+ (z0*z0*(zr-1)*(zr-1) - 2*z0*(zr-1)*zr + zr*zr)*p[2];
sp[3*i] = q0;
sp[3*i+1] = q1;
sp[3*i+2] = q2;
}
return(count-1);
}
void mtl_setup_monotonic_quadratic(thread float2* p,
int pathIndex,
device atomic_int* segmentCount,
device mg_mtl_segment* segmentBuffer,
const device mg_mtl_path_queue* pathQueueBuffer,
device mg_mtl_tile_queue* tileQueueBuffer,
device mg_mtl_tile_op* tileOpBuffer,
device atomic_int* tileOpCount,
int tileSize,
int debugID)
{
//TODO: collapse with other segment kinds
int segIndex = atomic_fetch_add_explicit(segmentCount, 1, memory_order_relaxed);
device mg_mtl_segment* seg = &segmentBuffer[segIndex];
seg->debugID = debugID;
seg->kind = MG_MTL_QUADRATIC;
seg->pathIndex = pathIndex;
seg->box = (vector_float4){min(p[0].x, p[2].x),
min(p[0].y, p[2].y),
max(p[0].x, p[2].x),
max(p[0].y, p[2].y)};
float dx = p[1].x - seg->box.x;
float dy = p[1].y - seg->box.y;
float alpha = (seg->box.w - seg->box.y)/(seg->box.z - seg->box.x);
float ofs = seg->box.w - seg->box.y;
if( (p[2].x > p[0].x && p[2].y < p[0].y)
||(p[2].x <= p[0].x && p[2].y > p[0].y))
{
if(dy < ofs - alpha*dx)
{
seg->config = MG_MTL_BL;
}
else
{
seg->config = MG_MTL_TR;
}
}
else if( (p[2].x > p[0].x && p[2].y >= p[0].y)
||(p[2].x <= p[0].x && p[2].y <= p[0].y))
{
//NOTE: it is important to include horizontal segments here, so that the mtl_is_left_of_segment() test
// becomes x > seg->box.x, in order to correctly detect right-crossing horizontal segments
if(dy > alpha*dx)
{
seg->config = MG_MTL_TL;
}
else
{
seg->config = MG_MTL_BR;
}
}
seg->windingIncrement = (p[2].y > p[0].y)? 1 : -1;
//NOTE: compute implicit equation matrix
float det = p[0].x*(p[1].y-p[2].y) + p[1].x*(p[2].y-p[0].y) + p[2].x*(p[0].y - p[1].y);
float a = p[0].y - p[1].y + 0.5*(p[2].y - p[0].y);
float b = p[1].x - p[0].x + 0.5*(p[0].x - p[2].x);
float c = p[0].x*p[1].y - p[1].x*p[0].y + 0.5*(p[2].x*p[0].y - p[0].x*p[2].y);
float d = p[0].y - p[1].y;
float e = p[1].x - p[0].x;
float f = p[0].x*p[1].y - p[1].x*p[0].y;
float flip = (seg->config == MG_MTL_TL || seg->config == MG_MTL_BL)? -1 : 1;
/*
seg->implicitMatrix = (1/det)*matrix_float3x3({flip*a, flip*d, a},
{flip*b, flip*e, b},
{flip*c, flip*f, c});
*/
float g = flip*(p[2].x*(p[0].y - p[1].y) + p[0].x*(p[1].y - p[2].y) + p[1].x*(p[2].y - p[0].y));
seg->implicitMatrix = (1/det)*matrix_float3x3({a, d, 0.},
{b, e, 0.},
{c, f, g});
mtl_bin_segment_to_tiles(segIndex, seg, pathQueueBuffer, tileQueueBuffer, tileOpBuffer, tileOpCount, tileSize);
}
kernel void mtl_segment_setup(constant int* elementCount [[buffer(0)]],
const device mg_mtl_path_elt* elementBuffer [[buffer(1)]],
device atomic_int* segmentCount [[buffer(2)]],
device mg_mtl_segment* segmentBuffer [[buffer(3)]],
const device mg_mtl_path_queue* pathQueueBuffer [[buffer(4)]],
device mg_mtl_tile_queue* tileQueueBuffer [[buffer(5)]],
device mg_mtl_tile_op* tileOpBuffer [[buffer(6)]],
device atomic_int* tileOpCount [[buffer(7)]],
constant int* tileSize [[buffer(8)]],
uint eltIndex [[thread_position_in_grid]])
{
const device mg_mtl_path_elt* elt = &elementBuffer[eltIndex];
float2 p0 = elt->p[0];
float2 p3 = elt->p[3];
if(elt->kind == MG_MTL_LINE)
{
int segIndex = atomic_fetch_add_explicit(segmentCount, 1, memory_order_relaxed);
device mg_mtl_segment* seg = &segmentBuffer[segIndex];
seg->debugID = 0;
seg->kind = elt->kind;
seg->pathIndex = elt->pathIndex;
seg->box = (vector_float4){min(p0.x, p3.x),
min(p0.y, p3.y),
max(p0.x, p3.x),
max(p0.y, p3.y)};
if( (p3.x > p0.x && p3.y < p0.y)
||(p3.x <= p0.x && p3.y > p0.y))
{
seg->config = MG_MTL_TR;
}
else if( (p3.x > p0.x && p3.y >= p0.y)
||(p3.x <= p0.x && p3.y <= p0.y))
{
//NOTE: it is important to include horizontal segments here, so that the mtl_is_left_of_segment() test
// becomes x > seg->box.x, in order to correctly detect right-crossing horizontal segments
seg->config = MG_MTL_BR;
}
seg->windingIncrement = (p3.y > p0.y)? 1 : -1;
mtl_bin_segment_to_tiles(segIndex, seg, pathQueueBuffer, tileQueueBuffer, tileOpBuffer, tileOpCount, tileSize[0]);
}
else if(elt->kind == MG_MTL_QUADRATIC)
{
//NOTE: Quadratic has at most two split points (ie 3 monotonic sub curves)
float2 p[3] = {elt->p[0], elt->p[1], elt->p[3]};
float2 sp[9];
int count = mtl_quadratic_monotonize(p, sp);
for(int i=0; i<count; i++)
{
mtl_setup_monotonic_quadratic(&sp[3*i],
elt->pathIndex,
segmentCount,
segmentBuffer,
pathQueueBuffer,
tileQueueBuffer,
tileOpBuffer,
tileOpCount,
tileSize[0],
1000 + count*10 + i);
}
}
}
kernel void mtl_backprop(const device mg_mtl_path_queue* pathQueueBuffer [[buffer(0)]],
@ -378,33 +572,21 @@ kernel void mtl_raster(const device int* screenTilesBuffer [[buffer(0)]],
{
const device mg_mtl_segment* seg = &segmentBuffer[op->index];
/*
if(seg->kind == MG_MTL_LINE && op->crossRight)
{
outTexture.write(float4(1, 0, 0, 1), uint2(pixelCoord));
return;
}
*/
if(pixelCoord.y >= seg->box.y && pixelCoord.y < seg->box.w)
{
if(pixelCoord.x < seg->box.x)
if(mtl_is_left_of_segment(float2(pixelCoord), seg))
{
winding += seg->windingIncrement;
}
else if(pixelCoord.x < seg->box.z)
{
/*TODO: if pixel is on opposite size of diagonal as curve on the right, increment
otherwise if not on same size of diagonal as curve, do implicit test
*/
float alpha = (seg->box.w - seg->box.y)/(seg->box.z - seg->box.x);
float ofs = seg->box.w - seg->box.y;
float dx = pixelCoord.x - seg->box.x;
float dy = pixelCoord.y - seg->box.y;
if( (seg->config == MG_MTL_BR && dy > alpha*dx)
||(seg->config == MG_MTL_TR && dy < ofs - alpha*dx))
{
winding += seg->windingIncrement;
}
else if( !(seg->config == MG_MTL_TL && dy < alpha*dx)
&& !(seg->config == MG_MTL_BL && dy > ofs - alpha*dx))
{
//Need implicit test, but for lines, we only have config BR or TR, so the test is always negative for now
}
}
}
if(op->crossRight)