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

[mtl canvas] don't trigger a new batch when setting the current image to nil (avoids creating a lot of batches when we just alternate between the same image and no image, eg painting multiple instances of the same image with a stroked border)

This commit is contained in:
Martin Fouilleul 2023-07-27 16:10:30 +02:00
parent 392bd3a756
commit 0c8e698b6e
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mtl_renderer.h
View File

@ -23,6 +23,7 @@ typedef struct mg_mtl_path
vector_float4 color; vector_float4 color;
vector_float4 box; vector_float4 box;
vector_float4 clip; vector_float4 clip;
int texture;
} mg_mtl_path; } mg_mtl_path;
typedef enum { typedef enum {

12
src/mtl_renderer.m
View File

@ -249,6 +249,12 @@ void mg_mtl_encode_path(mg_mtl_canvas_backend* backend, mg_primitive* primitive,
path->uvTransform = simd_matrix(simd_make_float3(uvTransform.m[0]/scale, uvTransform.m[3]/scale, 0), path->uvTransform = simd_matrix(simd_make_float3(uvTransform.m[0]/scale, uvTransform.m[3]/scale, 0),
simd_make_float3(uvTransform.m[1]/scale, uvTransform.m[4]/scale, 0), simd_make_float3(uvTransform.m[1]/scale, uvTransform.m[4]/scale, 0),
simd_make_float3(uvTransform.m[2], uvTransform.m[5], 1)); simd_make_float3(uvTransform.m[2], uvTransform.m[5], 1));
path->texture = 1;
}
else
{
path->texture = 0;
} }
int nTilesX = ((path->box.z - path->box.x)*scale - 1) / MG_MTL_TILE_SIZE + 1; int nTilesX = ((path->box.z - path->box.x)*scale - 1) / MG_MTL_TILE_SIZE + 1;
@ -1084,14 +1090,11 @@ void mg_mtl_render_batch(mg_mtl_canvas_backend* backend,
[rasterEncoder setTexture:backend->outTexture atIndex:0]; [rasterEncoder setTexture:backend->outTexture atIndex:0];
int useTexture = 0;
if(image) if(image)
{ {
mg_mtl_image_data* mtlImage = (mg_mtl_image_data*)image; mg_mtl_image_data* mtlImage = (mg_mtl_image_data*)image;
[rasterEncoder setTexture: mtlImage->texture atIndex: 1]; [rasterEncoder setTexture: mtlImage->texture atIndex: 1];
useTexture = 1;
} }
[rasterEncoder setBytes: &useTexture length:sizeof(int) atIndex: 9];
MTLSize rasterGridSize = MTLSizeMake(viewportSize.x, viewportSize.y, 1); MTLSize rasterGridSize = MTLSizeMake(viewportSize.x, viewportSize.y, 1);
MTLSize rasterGroupSize = MTLSizeMake(MG_MTL_TILE_SIZE, MG_MTL_TILE_SIZE, 1); MTLSize rasterGroupSize = MTLSizeMake(MG_MTL_TILE_SIZE, MG_MTL_TILE_SIZE, 1);
@ -1233,6 +1236,8 @@ void mg_mtl_canvas_render(mg_canvas_backend* interface,
{ {
mg_primitive* primitive = &primitives[primitiveIndex]; mg_primitive* primitive = &primitives[primitiveIndex];
if(primitive->attributes.image.h != 0)
{
if(primitiveIndex && (primitive->attributes.image.h != currentImage.h)) if(primitiveIndex && (primitive->attributes.image.h != currentImage.h))
{ {
mg_image_data* imageData = mg_image_data_from_handle(currentImage); mg_image_data* imageData = mg_image_data_from_handle(currentImage);
@ -1247,6 +1252,7 @@ void mg_mtl_canvas_render(mg_canvas_backend* interface,
scale); scale);
} }
currentImage = primitive->attributes.image; currentImage = primitive->attributes.image;
}
if(primitive->path.count) if(primitive->path.count)
{ {

3
src/mtl_renderer.metal
View File

@ -1512,7 +1512,6 @@ kernel void mtl_raster(const device mg_mtl_screen_tile* screenTilesBuffer [[buff
constant int* sampleCountBuffer [[buffer(6)]], constant int* sampleCountBuffer [[buffer(6)]],
device char* logBuffer [[buffer(7)]], device char* logBuffer [[buffer(7)]],
device atomic_int* logOffsetBuffer [[buffer(8)]], device atomic_int* logOffsetBuffer [[buffer(8)]],
constant int* useTexture [[buffer(9)]],
texture2d<float, access::write> outTexture [[texture(0)]], texture2d<float, access::write> outTexture [[texture(0)]],
texture2d<float> srcTexture [[texture(1)]], texture2d<float> srcTexture [[texture(1)]],
uint2 threadGroupCoord [[threadgroup_position_in_grid]], uint2 threadGroupCoord [[threadgroup_position_in_grid]],
@ -1611,7 +1610,7 @@ kernel void mtl_raster(const device mg_mtl_screen_tile* screenTilesBuffer [[buff
float4 nextColor = pathBuffer[pathIndex].color; float4 nextColor = pathBuffer[pathIndex].color;
nextColor.rgb *= nextColor.a; nextColor.rgb *= nextColor.a;
if(useTexture[0]) if(pathBuffer[pathIndex].texture)
{ {
constexpr sampler smp(mip_filter::nearest, mag_filter::linear, min_filter::linear); constexpr sampler smp(mip_filter::nearest, mag_filter::linear, min_filter::linear);