Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export sk_canvas_save_layer_rec to expose SkCanvas::SaveLayerRec functionality #130

Open
wants to merge 1 commit into
base: skiasharp
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/c/sk_canvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ SK_C_API bool sk_canvas_get_local_clip_bounds(sk_canvas_t* ccanvas, sk_rect_t* c
SK_C_API bool sk_canvas_get_device_clip_bounds(sk_canvas_t* ccanvas, sk_irect_t* cbounds);
SK_C_API int sk_canvas_save(sk_canvas_t* ccanvas);
SK_C_API int sk_canvas_save_layer(sk_canvas_t* ccanvas, const sk_rect_t* crect, const sk_paint_t* cpaint);
SK_C_API int sk_canvas_save_layer_rec(sk_canvas_t* ccanvas, const sk_rect_t* cbounds, const sk_paint_t* cpaint, const sk_imagefilter_t* cfilter, uint32_t flags);
SK_C_API void sk_canvas_restore(sk_canvas_t* ccanvas);
SK_C_API void sk_canvas_translate(sk_canvas_t* ccanvas, float dx, float dy);
SK_C_API void sk_canvas_scale(sk_canvas_t* ccanvas, float sx, float sy);
Expand Down
4 changes: 4 additions & 0 deletions src/c/sk_canvas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ int sk_canvas_save_layer(sk_canvas_t* ccanvas, const sk_rect_t* crect, const sk_
return AsCanvas(ccanvas)->saveLayer(AsRect(crect), AsPaint(cpaint));
}

int sk_canvas_save_layer_rec(sk_canvas_t* ccanvas, const sk_rect_t* cbounds, const sk_paint_t* cpaint, const sk_imagefilter_t* cfilter, uint32_t flags) {
Copy link

@mattleibow mattleibow Aug 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the enum also live in the C world and then the generator can find it and do the work. This also helps because you also need to update the src/c/sk_enums.cpp to do static checking. Enums go into include/c/sk_types.h

Many times, the C++ api inserts a new enum or changes the order and thus we have to catch this.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The C++ API doesn't actually use an enum but a uint32_t typedef, that's why I did it this way

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean, but I still think we can make the C API more sensible and also get the benefit of static value checking as I know the enum values do change between releases. For example, they have re-ordered/inserted values in the SkColorType enum several times already breaking the whole system because .NET does not work the same way as headers.

Copy link

@mattleibow mattleibow Aug 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, since the enum is part of the SkCanvas type, to avoid conflicts when they inevatably add a different save layer rec, the name should be sk_canvas_savelayerrec_flags_t.

I see in later versions of skia there are some other options available in the rec, such as filters and colorspace: https://github.com/google/skia/blob/main/include/core/SkCanvas.h#L684

So I think to avoid future confusion, the filter arg name should maybe be backdrop.

return AsCanvas(ccanvas)->saveLayer(SkCanvas::SaveLayerRec(AsRect(cbounds), AsPaint(cpaint), AsImageFilter(cfilter), flags));
}

void sk_canvas_restore(sk_canvas_t* ccanvas) {
AsCanvas(ccanvas)->restore();
}
Expand Down